summaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
diff options
context:
space:
mode:
authorLibravatar brian m. carlson <sandals@crustytoothpaste.net>2019-08-18 20:04:20 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-19 15:04:59 -0700
commit8d4d86b0f0a875e7916d7de083a88d7f11251406 (patch)
tree1b99e2d667ac3845e60f32e69862eed1a9b38ec6 /builtin/merge-ours.c
parentbuiltin/worktree: switch null_sha1 to null_oid (diff)
downloadtgif-8d4d86b0f0a875e7916d7de083a88d7f11251406.tar.xz
cache: remove null_sha1
All of the existing uses of null_sha1 can be converted into uses of null_oid, so do so. Remove null_sha1 and is_null_sha1, and define is_null_oid in terms of null_oid. This also has the additional benefit of removing several uses of sha1_to_hex. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions