aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-05-06 22:09:56 +0000
committerJunio C Hamano <gitster@pobox.com>2017-05-08 15:12:56 +0900
commit912c13d58faf355589a3f67fd55b2015561e0184 (patch)
treee7d36547c5b2ce88daf763f426243eab204b0741 /merge-recursive.c
parentd7e6b6a8dcc8a98a4dcf6bc291f1e68b1acaecae (diff)
downloadgit-912c13d58faf355589a3f67fd55b2015561e0184.tar.gz
git-912c13d58faf355589a3f67fd55b2015561e0184.tar.xz
fast-import: convert to struct object_id
Convert the remaining parts of fast-import.c to use struct object_id. Convert several instances of get_sha1_hex to parse_oid_hex to avoid needing to specify constants. Convert other hardcoded values to named constants. Finally, use the is_empty_tree_oid function instead of a direct comparison against a fixed string. Note that the odd computation with GIT_MAX_HEXSZ is due to the insertion of a slash between every two hex digits in the path, plus one for the terminating NUL. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions