From 7f46be3a0d97337e9270e625ab6065b8e3b3805b Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Fri, 29 Mar 2019 15:42:41 +0100 Subject: [PATCH] gits: dont ask to push -f to None Change-Id: I5edf0abff1b01a3d85e4bf2d77c8ab964e0bf2f0 --- src/gits | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gits b/src/gits index 2dbb011..10e94c0 100755 --- a/src/gits +++ b/src/gits @@ -337,12 +337,13 @@ def rebase(git_dir): git(git_dir, 'rebase', '-i', 'origin/master') # On conflicts, we'll exit with error implicitly - do_push = ask(git_dir, 'git push -f to overwrite %r?' % upstream_branch, - " don't overwrite upstream", - 'P `push -f` to overwrite upstream (P in caps!)', - valid_answers=('', 'P')) - if do_push == 'P': - git(git_dir, 'push', '-f') + if upstream_branch is not None: + do_push = ask(git_dir, 'git push -f to overwrite %r?' % upstream_branch, + " don't overwrite upstream", + 'P `push -f` to overwrite upstream (P in caps!)', + valid_answers=('', 'P')) + if do_push == 'P': + git(git_dir, 'push', '-f') return orig_branch