From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Oct 2011 23:14:30 GMT
Subject: Re: [PATCH] resolve_gitlink_packed_ref(): fix mismerge
Message-ID: <7vipnnjjmx.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4E9CA853.10107@gmail.com>

Mark Levedahl <mlevedahl@gmail.com> writes:

> On 10/17/2011 02:43 PM, Junio C Hamano wrote:
>> 2c5c66b (Merge branch 'jp/get-ref-dir-unsorted', 2011-10-10) merged a
>> topic that forked from the mainline before a new helper function
>> get_packed_refs() refactored code to read packed-refs file. The merge made
>> the call to the helper function with an incorrect argument. The parameter
>> to the function has to be a path to the submodule.
>>
>> Fix the mismerge.
>>
>> Helped-by: Mark Levedahl<mlevedahl@gmail.com>
>> Helped-by: Michael Haggerty<mhagger@alum.mit.edu>
>> Signed-off-by: Junio C Hamano<gitster@pobox.com>
>> ---
>>
> Thank you, this fixes the problem for me.

Thanks for a quick bug report and helping with the test.