summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-17 11:43:30 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-17 11:44:18 -0700
commite5fa45c159241b609bce40fa7a8687796e4b941d (patch)
tree197f5b0ea39cc4030466089049cd815309509df1 /git-bisect.sh
parent05f6edcd2a418a88eeb953d51408a6aeef312f5c (diff)
downloadgit-e5fa45c159241b609bce40fa7a8687796e4b941d.tar.gz
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>
Diffstat (limited to 'git-bisect.sh')
0 files changed, 0 insertions, 0 deletions