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 <gitster@xxxxxxxxx> > --- > 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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
