summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2013-06-13 21:36:12 +0530
committerJunio C Hamano <gitster@pobox.com>2013-06-13 15:30:02 -0700
commitaf2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5 (patch)
tree62dbd12b9cee7fb6ac4d4eee42b2d31ee65db8f7 /git-rebase.sh
parentdc8ca9123a5b8aa21d8e987875aa2112871f4afa (diff)
downloadgit-af2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5.tar.gz
rebase: finish_rebase() in fast-forward rebase
In the following case $ git rebase master Fast-forwarded autostash-fix to master. 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 2122fe030e..154d4be0a4 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -579,6 +579,7 @@ if test "$mb" = "$orig_head"
then
say "$(eval_gettext "Fast-forwarded \$branch_name to \$onto_name.")"
move_to_original_branch
+ finish_rebase
exit 0
fi