summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-20 23:44:35 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-20 23:44:35 -0800
commit1b8dbdb41e503f6829be4e1d8ada4c8eabbc49bd (patch)
tree1281bbf5a21e3381efde6ca8866c0cd17aecea25 /xdiff/xmerge.c
parentdescribe: do not use unannotated tag even if exact match (diff)
parentremote: fix use-after-free error detected by glibc in ref_remove_duplicates (diff)
downloadtgif-1b8dbdb41e503f6829be4e1d8ada4c8eabbc49bd.tar.xz
Merge branch 'jp/fetch-cull-many-refs'
* jp/fetch-cull-many-refs: remote: fix use-after-free error detected by glibc in ref_remove_duplicates fetch: Speed up fetch of large numbers of refs remote: Make ref_remove_duplicates faster for large numbers of refs
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions