diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:17:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:17:08 -0700 |
commit | 5a3db94539acbf66b9fcf466b5ea7fd53295dc89 (patch) | |
tree | a9ce37821d811e0b4c718ad87aa2457d5dfc97c4 /builtin/merge-base.c | |
parent | Merge branch 'jk/commit-buffer-length' into maint (diff) | |
parent | sha1_file: avoid overrunning alternate object base string (diff) | |
download | tgif-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