Re: [PATCH next] don't let mailmap provoke use of freed memory

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 15, 2010, 07:59 UTC
Message-ID: <20101015075954.GA8557@burratino>
In-Reply-To: <20101015061821.GE21830@burratino>

Jonathan Nieder wrote:

> Ævar Arnfjörð Bjarmason wrote:

Show 12 quoted lines

>> ok 6 - mailmap.file non-existant
>> not ok - 7 name entry after email entry
>> not ok - 8 name entry after email entry, case-insensitive
>> ok 9 - No mailmap files, but configured
>> ok 10 - Shortlog output (complex mapping)
>> ok 11 - Log output (complex mapping)
>> not ok - 12 Blame output (complex mapping)
>> # failed 3 among 12 test(s)
>
> Odd.  I can reproduce test 12 failing with commit ids changed
> (embarrassed I didn't notice before) but the others pass here.
> Trying a --valgrind run.

Well, this is embarrasing. Here's a minimal fix for the test #12 failure (for squashing --- it just undoes a change that should never have escaped the lab in the first place).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---

diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index f4f82c0..3c5188f 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -11,7 +11,6 @@ test_expect_success setup '
 	git commit -m initial &&
 	echo two >>one &&
 	git add one &&
-	test_tick &&
 	git commit --author "nick1 <bugs@company.xx>" -m second
 '