threads / patch / 10853

patch, 2 partst/t3404: fix test for a bogus todo file.

Subject: [PATCH 1/2] t/t3404: fix test for a bogus todo file.

## tl;dr

2 messages between Nov 13, 2007 and Nov 13, 2007. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Junio C Hamano· Nov 13, 2007, 21:14 UTC · lore

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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to t/t3404-rebase-interactive.sh +1 −1

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· Nov 13, 2007, 21:52 UTC · re: Junio C Hamano · lore

Re: [PATCH 1/2] t/t3404: fix test for a bogus todo file.

Hi,

On Tue, 13 Nov 2007, Junio C Hamano wrote:

Show 18 quoted lines

> 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 |    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