summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-06-13 21:36:13 +0530
committerJunio C Hamano <gitster@pobox.com>2013-06-13 15:31:06 -0700
commit96e2b99ed56c8433cc4aa03f32d2ef2a22748fc0 (patch)
tree3d3b4d30c165bfa655a900e20f1f5f25adadf8a3 /git-rebase.sh
parentaf2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5 (diff)
downloadgit-96e2b99ed56c8433cc4aa03f32d2ef2a22748fc0.tar.gz
rebase: finish_rebase() in noop rebase
In the following case $ git rebase master Current branch autostash-fix is up to date. the autostash is not applied automatically, because this codepath forgets to call finish_rebase(). Fix this. Also add a test to guard against regressions. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 154d4be0a4..2d5c2bd0fc 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -547,6 +547,7 @@ then
# Lazily switch to the target branch if needed...
test -z "$switch_to" || git checkout "$switch_to" --
say "$(eval_gettext "Current branch \$branch_name is up to date.")"
+ finish_rebase
exit 0
else
say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"