diff --git a/subcmds/rebase.py b/subcmds/rebase.py index 9464091f..9d4b1672 100644 --- a/subcmds/rebase.py +++ b/subcmds/rebase.py @@ -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 diff --git a/subcmds/sync.py b/subcmds/sync.py index a66dd6cd..3b4c23c5 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py @@ -635,7 +635,7 @@ later is required to fix a server side protocol bug. print('Failed to remove %s (%s)' % (os.path.join(path, '.git'), str(e)), file=sys.stderr) print('error: Failed to delete obsolete path %s' % path, file=sys.stderr) print(' remove manually, then run sync again', file=sys.stderr) - return -1 + return 1 # Delete everything under the worktree, except for directories that contain # another git project @@ -669,7 +669,7 @@ later is required to fix a server side protocol bug. if failed: print('error: Failed to delete obsolete path %s' % path, file=sys.stderr) print(' remove manually, then run sync again', file=sys.stderr) - return -1 + return 1 # Try deleting parent dirs if they are empty project_dir = path @@ -726,9 +726,9 @@ later is required to fix a server side protocol bug. 'are present' % project.relpath, file=sys.stderr) print(' commit changes, then run sync again', file=sys.stderr) - return -1 + return 1 elif self._DeleteProject(project.worktree): - return -1 + return 1 new_project_paths.sort() fd = open(file_path, 'w')