git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ab47df2)
builtin/merge-recursive: make hash independent
authorbrian m. carlson <redacted>
Mon, 16 Jul 2018 01:28:04 +0000 (01:28 +0000)
committerJunio C Hamano <redacted>
Mon, 16 Jul 2018 21:27:39 +0000 (14:27 -0700)
commitb7f20f72047f3ec22c7daff61a40f52f85ad0b3a
tree594cd42e4f3d2ab41045606e0fda53b5b8e5d008tree | snapshot
parentab47df2d9a1d07380a02c9be2c57bca1cfbb054ecommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
builtin/merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT