diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2018-07-16 01:28:04 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-16 14:27:39 -0700 |
| commit | b7f20f72047f3ec22c7daff61a40f52f85ad0b3a (patch) | |
| tree | 594cd42e4f3d2ab41045606e0fda53b5b8e5d008 /xdiff | |
| parent | builtin/merge: switch to use the_hash_algo (diff) | |
| download | tgif-b7f20f72047f3ec22c7daff61a40f52f85ad0b3a.tar.xz | |
builtin/merge-recursive: make hash independent
Use GIT_MAX_HEXSZ instead of GIT_SHA1_HEXSZ for an allocation so that it
is sufficiently large. Switch a comparison to use the_hash_algo to
determine the length of a hex object ID.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions