Mark Levedahl <mlevedahl@xxxxxxxxx> 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@xxxxxxxxx> >> Helped-by: Michael Haggerty<mhagger@xxxxxxxxxxxx> >> Signed-off-by: Junio C Hamano<gitster@xxxxxxxxx> >> --- >> > Thank you, this fixes the problem for me. Thanks for a quick bug report and helping with the test. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html