# [PATCH 1/2] t/t3404: fix test for a bogus todo file. 2 messages from 2007-11-13 to 2007-11-13. Participants: Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/10853 ## Junio C Hamano, 2007-11-13 21:14 Subject: [PATCH 1/2] t/t3404: fix test for a bogus todo file. Message-ID: <7vhcjpsv9a.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vhcjpsv9a.fsf%40gitster.siamese.dyndns.org ``` The test wants to see if there are still remaining tasks, but checked a wrong file. Signed-off-by: Junio C Hamano --- 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 1113904..f1039d1 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' ' -- 1.5.3.5.1728.g34b3e ``` ## Johannes Schindelin, 2007-11-13 21:52 Subject: Re: [PATCH 1/2] t/t3404: fix test for a bogus todo file. Message-ID: URL: https://gitlist.dev/e/Pine.LNX.4.64.0711132152040.4362%40racer.site In-Reply-To: <7vhcjpsv9a.fsf@gitster.siamese.dyndns.org> ``` Hi, On Tue, 13 Nov 2007, Junio C Hamano wrote: > The test wants to see if there are still remaining tasks, but checked a > wrong file. > > Signed-off-by: Junio C Hamano > --- > 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 1113904..f1039d1 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) Oh well, another fallout of my brilliant name picking. Thanks, Dscho ```