Mercurial > hg
changeset 13107:3bc237b0eaea
subrepo: treat git error code 1 as success
At least status, commit, merge-base, and diff all return 1 when not failing.
| author | Eric Eisner <ede@mit.edu> |
|---|---|
| date | Thu, 09 Dec 2010 16:52:14 -0500 |
| parents | c869bd9e1193 |
| children | dcaad69cfd6a |
| files | mercurial/subrepo.py |
| diffstat | 1 files changed, 1 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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))