summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-07-16 01:28:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-16 21:27:39 (GMT)
commit5188eb5d8e80c2f330fbafb021ffa28bac2ef88a (patch)
tree7c1c54fbf8755e99dc118bf1e8d8e5c36375a789 /builtin/merge.c
parentfe04ccf7ca124d5ba980090868b173d873104f16 (diff)
downloadgit-5188eb5d8e80c2f330fbafb021ffa28bac2ef88a.zip
git-5188eb5d8e80c2f330fbafb021ffa28bac2ef88a.tar.gz
git-5188eb5d8e80c2f330fbafb021ffa28bac2ef88a.tar.bz2
builtin/fmt-merge-msg: make hash independent
Convert several uses of GIT_SHA1_HEXSZ into references to the_hash_algo. Switch other uses into a use of parse_oid_hex and uses of its computed pointer. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions