From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Mon, 16 Jul 2018 01:28:04 +0000 (+0000)
Subject: builtin/merge-recursive: make hash independent
X-Git-Tag: v2.19.0-rc0~112^2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7f20f72047f3ec22c7daff61a40f52f85ad0b3a?hp=b7f20f72047f3ec22c7daff61a40f52f85ad0b3a

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>
---