diff options
| author |  Ramkumar Ramachandra <artagnon@gmail.com> | 2013-06-13 21:36:12 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-06-13 15:30:02 -0700 |
| commit | af2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5 (patch) | |
| tree | 62dbd12b9cee7fb6ac4d4eee42b2d31ee65db8f7 /builtin/merge-tree.c | |
| parent | rebase: guard against missing files in read_basic_state() (diff) | |
| download | tgif-af2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5.tar.xz | |
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 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions