| commit | af2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5 | |
| author | Ramkumar Ramachandra <artagnon@gmail.com> | |
| Thu, 13 Jun 2013 16:06:12 +0000 (13 21:36 +0530) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 13 Jun 2013 22:30:02 +0000 (13 15:30 -0700) | ||
| tree | 62dbd12b9cee7fb6ac4d4eee42b2d31ee65db8f7 | treesnapshot (tar.gz zip) |
| parent | dc8ca9123a5b8aa21d8e987875aa2112871f4afa | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t3420-rebase-autostash.sh | diffblobblamehistory |