diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
| commit | adc7052bb6e737cec0c6702f8dde259540eab672 (patch) | |
| tree | 9a3bfa9ff1389908213adcbddedfa09bf8b88c7b /t/t3404-rebase-interactive.sh | |
| parent | 9de96815493b577ae791d5113a3e354142ffbcae (diff) | |
| parent | cb8ad289c6b3f774e6e4431a08eb585eadbb8dad (diff) | |
| download | git-adc7052bb6e737cec0c6702f8dde259540eab672.tar.gz | |
Merge branch 'maint'
By Jens Lehmann (1) and Johannes Sixt (1)
* maint:
Consistently use "superproject" instead of "supermodule"
t3404: begin "exchange commits with -p" test with correct preconditions
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 4983bd7775..025c1c610e 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -247,6 +247,7 @@ test_expect_success '-p handles "no changes" gracefully' ' ' test_expect_failure 'exchange two commits with -p' ' + git checkout H && 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) |