projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b2a182
)
t/t3404: fix test for a bogus todo file.
author
Junio C Hamano
<gitster@pobox.com>
Tue, 13 Nov 2007 21:05:50 +0000
(13:05 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 13 Nov 2007 21:25:23 +0000
(13:25 -0800)
The test wants to see if there are still remaining tasks, but checked
a wrong file.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3404-rebase-interactive.sh
patch
|
blob
|
history
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index 6c92d61192570d0d1d7a35e1304e9c8046926410..984146b5c2216e4dc4c7bd62bb60bd8ef9c3b615 100755
(executable)
--- 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' '