My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dc8ca91) | patch
rebase: finish_rebase() in fast-forward rebase
authorRamkumar Ramachandra <artagnon@gmail.com>
Thu, 13 Jun 2013 16:06:12 +0000 (21:36 +0530)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Jun 2013 22:30:02 +0000 (15:30 -0700)
commitaf2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5
tree62dbd12b9cee7fb6ac4d4eee42b2d31ee65db8f7tree | snapshot
parentdc8ca9123a5b8aa21d8e987875aa2112871f4afacommit | diff
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>
git-rebase.sh diff | blob | history
t/t3420-rebase-autostash.sh diff | blob | history
The core git plumbing