From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <junio@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] t/t3404: fix test for a bogus todo file.
Date: Tue, 13 Nov 2007 21:52:27 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0711132152040.4362@racer.site> (raw)
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 <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
prev parent reply other threads:[~2007-11-13 21:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0711132152040.4362@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junio@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).