summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Jacob Keller <jacob.keller@gmail.com>2016-08-31 16:27:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-31 18:07:08 -0700
commit8576fde6cb4013a41d162e33f7a0046a5ea6801e (patch)
treea94696726b0bb8535aa4d52e03b881e3804ad220 /git-mergetool.sh
parentSync with maint (diff)
downloadtgif-8576fde6cb4013a41d162e33f7a0046a5ea6801e.tar.xz
cache: add empty_tree_oid object and helper function
Similar to is_null_oid(), and is_empty_blob_sha1() add an empty_tree_oid along with helper function is_empty_tree_oid(). For completeness, also add an "is_empty_tree_sha1()", "is_empty_blob_sha1()", "is_empty_tree_oid()" and "is_empty_blob_oid()" helpers. To ensure we only get one singleton, implement EMPTY_BLOB_SHA1_BIN as simply getting the hash of empty_blob_oid structure. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions