diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-13 13:05:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-13 13:25:23 -0800 |
| commit | aac5bf0b48c5f23cf482ca7958fa6815fe6502ed (patch) | |
| tree | 76e298526af81567319e7bcdd0c3b881bfc308f0 /t/t3404-rebase-interactive.sh | |
| parent | Merge branch 'sp/maint-plug-traverse-commit-list-leak' into maint (diff) | |
| download | tgif-aac5bf0b48c5f23cf482ca7958fa6815fe6502ed.tar.xz | |
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 <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 6c92d61192..984146b5c2 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' ' |