submodule: make zero-oid comparison hash function agnostic
With SHA-256, the length of the all-zeros object ID is longer. Add a function to git-submodule.sh to check if a full hex object ID is the all-zeros value, and use it to check the output we're parsing from git diff-files or diff-index. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Oct 15, 2018 at 00:02 UTC
dda634687717fd8aafd54cae9ae3d9b2902e276e
1 file changed
+6
-1
git-submodule.sh
+6
-1
@@ -82,6 +82,11 @@ isnumber()
82
n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
83
}
84
85
+# Given a full hex object ID, is this the zero OID?
86
+is_zero_oid () {
87
+ echo "$1" | sane_egrep '^0+$' >/dev/null 2>&1
88
+}
89
+
90
# Sanitize the local git environment for use within a submodule. We
91
# can't simply use clear_local_git_env since we want to preserve some
92
# of the settings from GIT_CONFIG_PARAMETERS.
@@ -780,7 +785,7 @@ cmd_summary() {
785
while read -r mod_src mod_dst sha1_src sha1_dst status name
786
do
787
if test -z "$cached" &&
783
- test $sha1_dst = 0000000000000000000000000000000000000000
788
+ is_zero_oid $sha1_dst
789
then
790
case "$mod_dst" in
791
160000)