summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-16 11:17:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-16 11:17:08 -0700
commit5a3db94539acbf66b9fcf466b5ea7fd53295dc89 (patch)
treea9ce37821d811e0b4c718ad87aa2457d5dfc97c4 /builtin/merge-base.c
parentMerge branch 'jk/commit-buffer-length' into maint (diff)
parentsha1_file: avoid overrunning alternate object base string (diff)
downloadtgif-5a3db94539acbf66b9fcf466b5ea7fd53295dc89.tar.xz
Merge branch 'rs/fix-alt-odb-path-comparison' into maint
Code to avoid adding the same alternate object store twice was subtly broken for a long time, but nobody seems to have noticed. * rs/fix-alt-odb-path-comparison: sha1_file: avoid overrunning alternate object base string
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions