]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: af2f0eb) | patch
rebase: finish_rebase() in noop rebase
authorRamkumar Ramachandra <artagnon@gmail.com>
Thu, 13 Jun 2013 16:06:13 +0000 (21:36 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2013 22:31:06 +0000 (15:31 -0700)
commit96e2b99ed56c8433cc4aa03f32d2ef2a22748fc0
tree3d3b4d30c165bfa655a900e20f1f5f25adadf8a3tree | snapshot
parentaf2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5commit | diff
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>
git-rebase.sh diff | blob | history
t/t3420-rebase-autostash.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.