comparison mercurial/subrepo.py @ 13107:3bc237b0eaea

subrepo: treat git error code 1 as success

At least status, commit, merge-base, and diff all return 1 when not failing.

13106:c869bd9e1193

        retdata = p.stdout.read().strip()
        # wait for the child to exit to avoid race condition.
        p.wait()

        if p.returncode != 0:
            # there are certain error codes that are ok
            command = None
            for arg in commands:
                if not arg.startswith('-'):
                    command = arg
                    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))

        return retdata, p.returncode

13107:3bc237b0eaea

        retdata = p.stdout.read().strip()
        # wait for the child to exit to avoid race condition.
        p.wait()

        if p.returncode != 0 and p.returncode != 1:
            # there are certain error codes that are ok
            command = None
            for arg in commands:
                if not arg.startswith('-'):
                    command = arg
                    break
            if command == 'cat-file':
                return retdata, p.returncode
            # for all others, abort
            raise util.Abort('git %s error %d' % (command, p.returncode))

        return retdata, p.returncode