Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5_fork
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Eteri
erp5_fork
Commits
83aaa091
Commit
83aaa091
authored
May 11, 2011
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5VCS: revert local commit if push failed due to authentication
parent
0e98548d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
product/ERP5VCS/Git.py
product/ERP5VCS/Git.py
+3
-1
No files found.
product/ERP5VCS/Git.py
View file @
83aaa091
...
...
@@ -352,8 +352,10 @@ class Git(WorkingCopy):
reset
+=
1
# retry to push everything
self
.
remote_git
(
*
push_args
)
except
GitError
,
e
:
except
(
GitError
,
GitLoginError
)
,
e
:
self
.
git
(
'reset'
,
'--soft'
,
'@{%u}'
%
reset
)
if
isinstance
(
e
,
GitLoginError
):
raise
portal_status_message
=
str
(
e
)
else
:
head
=
self
.
git
(
'rev-parse'
,
'--short'
,
'HEAD'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment