| commit | e5fa45c159241b609bce40fa7a8687796e4b941d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Oct 2011 18:43:30 +0000 (17 11:43 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Oct 2011 18:44:18 +0000 (17 11:44 -0700) | ||
| tree | 197f5b0ea39cc4030466089049cd815309509df1 | treesnapshot (tar.gz zip) |
| parent | 05f6edcd2a418a88eeb953d51408a6aeef312f5c | commitdiff |
resolve_gitlink_packed_ref(): fix mismerge
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>
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>
| refs.c | diffblobblamehistory | |
| t/t3000-ls-files-others.sh | diffblobblamehistory |