* [PATCH 1/2] t/t3404: fix test for a bogus todo file.
@ 2007-11-13 21:14 Junio C Hamano
2007-11-13 21:52 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Junio C Hamano @ 2007-11-13 21:14 UTC (permalink / raw)
To: git
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)
'
test_expect_success 'abort' '
--
1.5.3.5.1728.g34b3e
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] t/t3404: fix test for a bogus todo file.
2007-11-13 21:14 [PATCH 1/2] t/t3404: fix test for a bogus todo file Junio C Hamano
@ 2007-11-13 21:52 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2007-11-13 21:52 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-13 21:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-13 21:14 [PATCH 1/2] t/t3404: fix test for a bogus todo file Junio C Hamano
2007-11-13 21:52 ` Johannes Schindelin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).