From: Junio C Hamano <gitster@pobox.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Jonathan Nieder" <jrnieder@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jim Meyering" <jim@meyering.net>,
"git list" <git@vger.kernel.org>,
"Thomas Rast" <trast@student.ethz.ch>
Subject: Re: [PATCH] t4203 (mailmap): stop hardcoding commit ids and dates
Date: Tue, 19 Oct 2010 23:31:52 -0700 [thread overview]
Message-ID: <7vlj5twf1j.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7vsk01wf65.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue\, 19 Oct 2010 23\:29\:06 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Jonathan Nieder <jrnieder@gmail.com> writes:
>>
>>> Here's a better fix. Still no idea about the other failures Ævar
>>> and Thomas were seeing.
>>
>> I saw intermittent failures too. Thanks for the objid fix.
>
> I found a way to reliably make this fail at test #7.
>
> $ sh t4203-mailmap.sh </dev/null
>
> Without the input redirection, things seem to work Ok.
>
> Still puzzled...
Ah, of course.
t/t4203-mailmap.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index a267d07..e818de6 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -114,7 +114,7 @@ test_expect_success 'name entry after email entry' '
mkdir -p internal_mailmap &&
echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
echo "Internal Guy <bugs@company.xx>" >>internal_mailmap/.mailmap &&
- git shortlog >actual &&
+ git shortlog HEAD >actual &&
test_cmp expect actual
'
@@ -131,7 +131,7 @@ test_expect_success 'name entry after email entry, case-insensitive' '
mkdir -p internal_mailmap &&
echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
echo "Internal Guy <BUGS@Company.xx>" >>internal_mailmap/.mailmap &&
- git shortlog >actual &&
+ git shortlog HEAD >actual &&
test_cmp expect actual
'
prev parent reply other threads:[~2010-10-20 6:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-11 15:41 [PATCH next] don't let mailmap provoke use of freed memory Jim Meyering
2010-10-11 16:21 ` Jonathan Nieder
2010-10-15 5:22 ` Ævar Arnfjörð Bjarmason
2010-10-15 6:18 ` Jonathan Nieder
2010-10-15 7:59 ` Jonathan Nieder
2010-10-15 17:12 ` [PATCH] t4203 (mailmap): stop hardcoding commit ids and dates Jonathan Nieder
2010-10-17 4:43 ` Junio C Hamano
2010-10-20 6:29 ` Junio C Hamano
2010-10-20 6:31 ` Junio C Hamano [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=7vlj5twf1j.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jim@meyering.net \
--cc=jrnieder@gmail.com \
--cc=trast@student.ethz.ch \
/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).