Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: treat git error code 1 as success
authorEric Eisner <ede@mit.edu>
Thu, 09 Dec 2010 16:52:14 -0500
changeset 13107 3bc237b0eaea
parent 13106 c869bd9e1193
child 13108 dcaad69cfd6a
subrepo: treat git error code 1 as success At least status, commit, merge-base, and diff all return 1 when not failing.
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/mercurial/subrepo.py	Thu Dec 09 16:52:14 2010 -0500
+++ b/mercurial/subrepo.py	Thu Dec 09 16:52:14 2010 -0500
@@ -641,7 +641,7 @@
         # wait for the child to exit to avoid race condition.
         p.wait()
 
-        if p.returncode != 0:
+        if p.returncode != 0 and p.returncode != 1:
             # there are certain error codes that are ok
             command = None
             for arg in commands:
@@ -650,8 +650,6 @@
                     break
             if command == 'cat-file':
                 return retdata, p.returncode
-            if command in ('commit', 'status') and p.returncode == 1:
-                return retdata, p.returncode
             # for all others, abort
             raise util.Abort('git %s error %d' % (command, p.returncode))
mercurial