From: Junio C Hamano Date: Tue, 13 Nov 2007 21:05:50 +0000 (-0800) Subject: t/t3404: fix test for a bogus todo file. X-Git-Tag: v1.5.3.6~16 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aac5bf0b48c5f23cf482ca7958fa6815fe6502ed;p=git.git t/t3404: fix test for a bogus todo file. The test wants to see if there are still remaining tasks, but checked a wrong file. Signed-off-by: Junio C Hamano --- diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 6c92d6119..984146b5c 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -149,7 +149,7 @@ test_expect_success 'stop on conflicting pick' ' diff -u expect .git/.dotest-merge/patch && diff -u expect2 file1 && test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) && - test 0 = $(grep -v "^#" < .git/.dotest-merge/todo | wc -l) + test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo | wc -l) ' test_expect_success 'abort' '