Tools/git-repo
1
0
Fork 0
Code Activity

rebase/sync: use exit(1) for errors instead of exit(-1)

Browse source 
Callers don't actually see -1 (they'll usually see 255, but the exact
answer here is complicated).  Just switch to 1 as that's the standard
value tools use to indicate an error.

Change-Id: Ib712db1924bc3e5f7920bafd7bb5fb61f3bda44f
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/233553
Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Tested-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Mike Frysinger 2019-08-07 17:19:24 -04:00
parent a34186e481
commit a850ca2712
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subcmds/rebase.py
View file

@ -71,7 +71,7 @@ branch but need to incorporate new upstream changes "underneath" them.
if len(args) == 1:
print('note: project %s is mapped to more than one path' % (args[0],),
file=sys.stderr)
return -1
return 1
for project in all_projects:
cb = project.CurrentBranch
@ -79,7 +79,7 @@ branch but need to incorporate new upstream changes "underneath" them.
if one_project:
print("error: project %s has a detached HEAD" % project.relpath,
file=sys.stderr)
return -1
return 1
# ignore branches with detatched HEADs
continue
@ -88,7 +88,7 @@ branch but need to incorporate new upstream changes "underneath" them.
if one_project:
print("error: project %s does not track any remote branches"
% project.relpath, file=sys.stderr)
return -1
return 1
# ignore branches without remotes
continue
@ -131,13 +131,13 @@ branch but need to incorporate new upstream changes "underneath" them.
stash_args = ["stash"]
if GitCommand(project, stash_args).Wait() != 0:
return -1
return 1
if GitCommand(project, args).Wait() != 0:
return -1
return 1
if needs_stash:
stash_args.append('pop')
stash_args.append('--quiet')
if GitCommand(project, stash_args).Wait() != 0:
return -1
return 1