diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:31:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:31:47 -0700 |
| commit | a7e664fc2a43c93da57c827b8ef9b7e15de2f249 (patch) | |
| tree | d832fa468602e092b5ce1f16c7b8137447146d48 /t | |
| parent | Merge branch 'jn/checkout-doc' into maint (diff) | |
| parent | rebase -i -p: document shortcomings (diff) | |
| download | tgif-a7e664fc2a43c93da57c827b8ef9b7e15de2f249.tar.xz | |
Merge branch 'jn/document-rebase-i-p-limitation' into maint
* jn/document-rebase-i-p-limitation:
rebase -i -p: document shortcomings
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index f20ea38411..6668907ec5 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -181,6 +181,12 @@ test_expect_success '-p handles "no changes" gracefully' ' test $HEAD = $(git rev-parse HEAD) ' +test_expect_failure 'exchange two commits with -p' ' + FAKE_LINES="2 1" git rebase -i -p HEAD~2 && + test H = $(git cat-file commit HEAD^ | sed -ne \$p) && + test G = $(git cat-file commit HEAD | sed -ne \$p) +' + test_expect_success 'preserve merges with -p' ' git checkout -b to-be-preserved master^ && : > unrelated-file && |