summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2012-09-09 08:19:41 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-12 11:46:31 -0700
commit382a96711470489ea6e4e277accd3afc46526bfc (patch)
tree061a8f50b081cc31daf5634d879b87242e15d369 /merge-recursive.c
parentChange fetch_pack() and friends to take string_list arguments (diff)
downloadtgif-382a96711470489ea6e4e277accd3afc46526bfc.tar.xz
filter_refs(): do not check the same sought_pos twice
Once a match has been found at sought_pos, the entry is zeroed and no future attempts will match that entry. So increment sought_pos to avoid checking against the zeroed-out entry during the next iteration. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions