t/t3404: fix test for a bogus todo file.

gitster · gitster · commit aac5bf0b48c5 · 2007-11-13T13:25:23.000-08:00
The test wants to see if there are still remaining tasks, but checked
a wrong file.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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' '

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ test_expect_success 'stop on conflicting pick' '`
`149`	`149`	`diff -u expect .git/.dotest-merge/patch &&`
`150`	`150`	`diff -u expect2 file1 &&`
`151`	`151`	`test 4 = $(grep -v "^#" < .git/.dotest-merge/done \| wc -l) &&`
`152`		`- test 0 = $(grep -v "^#" < .git/.dotest-merge/todo \| wc -l)`
	`152`	`+ test 0 = $(grep -v "^#" < .git/.dotest-merge/git-rebase-todo \| wc -l)`
`153`	`153`	`'`
`154`	`154`
`155`	`155`	`test_expect_success 'abort' '`