diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-23 04:09:10 +0100 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-11-23 04:09:19 +0100 |
commit | ae79f4b349d7d5efa674cde54b2cab162b5ad3a9 (patch) | |
tree | cdd979f5ff50456f9cb99ecc592dba136162799b /src/gits | |
parent | 20d95d003e723b0dcf9123f6007e50c83405a5e7 (diff) |
gits: fix ask_reset_hard_or_push_f(), missing args
Change-Id: I91a1087ce1f6399ff652dfeba0097f275050aba3
Diffstat (limited to 'src/gits')
-rwxr-xr-x | src/gits | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -238,7 +238,7 @@ def ask(git_dir, *question, valid_answers=('*',)): return answer -def ask_reset_hard_or_push_f(git_dir): +def ask_reset_hard_or_push_f(git_dir, orig_branch, upstream_branch): do_reset = ask(git_dir, 'Diverged.', '%s: git reset --hard %s?' % ( orig_branch, upstream_branch), @@ -290,7 +290,7 @@ def rebase(git_dir): # Diverged elif ahead and behind: - ask_reset_hard_or_push_f(git_dir) + ask_reset_hard_or_push_f(git_dir, orig_branch, upstream_branch) # Behind elif behind: @@ -318,7 +318,7 @@ def rebase(git_dir): git(git_dir, 'commit', '-am', 'wip', may_fail=True) git(git_dir, 'checkout', orig_branch) - ask_reset_hard_or_push_f(git_dir) + ask_reset_hard_or_push_f(git_dir, orig_branch, upstream_branch) return orig_branch |