summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2015-06-03 15:51:59 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-08 10:35:41 -0700
commit501cf47cddfbf8040b6f9b8ac06d13094a70f729 (patch)
tree64d8e2187d0dc508da8b916a205b8cfe6d893418 /mergetools/tortoisemerge
parentread_loose_refs(): simplify function logic (diff)
downloadtgif-501cf47cddfbf8040b6f9b8ac06d13094a70f729.tar.xz
read_loose_refs(): treat NULL_SHA1 loose references as broken
NULL_SHA1 is used to indicate an "invalid object name" throughout our code (and the code of other git implementations), so it is vastly more likely that an on-disk reference was set to this value due to a software bug than that NULL_SHA1 is the legitimate SHA-1 of an actual object. Therefore, if a loose reference has the value NULL_SHA1, consider it to be broken. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions