diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:43:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 13:43:10 -0800 |
| commit | 58c58c8624d77ff4087ad93e515402db218684f6 (patch) | |
| tree | 33dea809419b810a9688e763bcf7ecdf63fd8cf6 /t | |
| parent | 2f739695700e4a9d9de640ff623fe4e728f5b23a (diff) | |
| parent | ef88ad238779c4eadba9f179146fe213f047b89f (diff) | |
| download | git-58c58c8624d77ff4087ad93e515402db218684f6.tar.gz git-58c58c8624d77ff4087ad93e515402db218684f6.tar.xz | |
Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint
* jc/maint-rebase-rewrite-last-skip:
rebase --skip: correctly wrap-up when skipping the last patch
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5407-post-rewrite-hook.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh index 552da65a6..baa670cea 100755 --- a/t/t5407-post-rewrite-hook.sh +++ b/t/t5407-post-rewrite-hook.sh @@ -10,7 +10,11 @@ test_expect_success 'setup' ' test_commit A foo A && test_commit B foo B && test_commit C foo C && - test_commit D foo D + test_commit D foo D && + git checkout A^0 && + test_commit E bar E && + test_commit F foo F && + git checkout master ' mkdir .git/hooks @@ -79,6 +83,18 @@ EOF verify_hook_input ' +test_expect_success 'git rebase --skip the last one' ' + git reset --hard F && + clear_hook_input && + test_must_fail git rebase --onto D A && + git rebase --skip && + echo rebase >expected.args && + cat >expected.data <<EOF && +$(git rev-parse E) $(git rev-parse HEAD) +EOF + verify_hook_input +' + test_expect_success 'git rebase -m' ' git reset --hard D && clear_hook_input && |