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 /t/t3420-rebase-autostash.sh | |
| parent | dc8ca9123a5b8aa21d8e987875aa2112871f4afa (diff) | |
| download | git-af2f0ebcbdb164043d6ad72c81c6ce5cdadf63b5.tar.gz git-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 't/t3420-rebase-autostash.sh')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 479cbb215..1bde00716 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -141,6 +141,17 @@ testrebase() { ' } +test_expect_success "rebase: fast-forward rebase" ' + test_config rebase.autostash true && + git reset --hard && + git checkout -b behind-feature-branch feature-branch~1 && + test_when_finished git branch -D behind-feature-branch && + echo dirty >>file1 && + git rebase feature-branch && + grep dirty file1 && + git checkout feature-branch +' + testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge testrebase " --interactive" .git/rebase-merge |