Re: [PATCH] t4203 (mailmap): stop hardcoding commit ids and dates
Junio C Hamano <gitster@pobox.com> writes:
Show 16 quoted lines
> 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
'
Junio C Hamano <gitster@pobox.com>