Signed-off-by: Jörg Sommer <joerg@xxxxxxxxxxxx> --- t/t3404-rebase-interactive.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 9cf873f..7d1e469 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -185,7 +185,7 @@ test_expect_success 'retain authorship when squashing' ' test_expect_success '-p handles "no changes" gracefully' ' HEAD=$(git rev-parse HEAD) && - git rebase -i -p HEAD^ && + EXPECT_COUNT=1 git rebase -i -p HEAD^ && test $HEAD = $(git rev-parse HEAD) ' @@ -205,7 +205,7 @@ test_expect_success 'preserve merges with -p' ' test_tick && git commit -m K file1 && test_tick && - git rebase -i -p --onto branch1 master && + EXPECT_COUNT=3 git rebase -i -p --onto branch1 master && test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) && test $(git rev-parse HEAD~3) = $(git rev-parse branch1) && test $(git show HEAD:file1) = C && -- 1.5.4.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
