Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Commits
d6b63c7f
Commit
d6b63c7f
authored
Aug 29, 2013
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Vcs: New push reject message has been introduced in at least Git 1.8.4.
parent
8605209d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
product/ERP5VCS/Git.py
product/ERP5VCS/Git.py
+2
-1
No files found.
product/ERP5VCS/Git.py
View file @
d6b63c7f
...
...
@@ -351,7 +351,8 @@ class Git(WorkingCopy):
# first check why we could not push
status
=
[
x
for
x
in
e
.
stdout
.
splitlines
()
if
x
[:
1
]
==
'!'
]
if
(
len
(
status
)
!=
1
or
status
[
0
].
split
()[
2
:]
!=
[
'[rejected]'
,
'(non-fast-forward)'
]):
not
re
.
match
(
r'.*\
[
rejected\
]
\s*\
((
fetch first|non-fast-forward)\
)
',
status[0])):
raise
self.remote_git('
fetch
', '
--
prune
', remote)
if not self.getBehindCount():
...
...
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