diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-23 14:53:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-23 14:53:08 -0700 |
| commit | afaa2a479d4994b0e98847f95754f8c3536a662a (patch) | |
| tree | 706c9c71ba3968db33e8931f481513ae305c9d36 /t | |
| parent | 352e86e5431509b6834b6d22d139356b6ba6e1b9 (diff) | |
| parent | 96e2b99ed56c8433cc4aa03f32d2ef2a22748fc0 (diff) | |
| download | git-afaa2a479d4994b0e98847f95754f8c3536a662a.tar.gz | |
Merge branch 'rr/rebase-autostash'
* rr/rebase-autostash:
rebase: finish_rebase() in noop rebase
rebase: finish_rebase() in fast-forward rebase
rebase: guard against missing files in read_basic_state()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 479cbb215f..90eb26493c 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -141,6 +141,28 @@ 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 +' + +test_expect_success "rebase: noop rebase" ' + test_config rebase.autostash true && + git reset --hard && + git checkout -b same-feature-branch feature-branch && + test_when_finished git branch -D same-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 |