diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-10-15 00:02:01 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-15 12:53:16 +0900 |
| commit | dda634687717fd8aafd54cae9ae3d9b2902e276e (patch) | |
| tree | ebb44e35fd307d70f8098f5acde92a039daf0ec4 /git-submodule.sh | |
| parent | eccb5a5f3d8d49ec9b4645aac94bffb7e504f10f (diff) | |
| download | git-dda634687717fd8aafd54cae9ae3d9b2902e276e.tar.gz | |
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>
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 1b568e29b9..c09eb3e03d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -82,6 +82,11 @@ isnumber() n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1" } +# Given a full hex object ID, is this the zero OID? +is_zero_oid () { + echo "$1" | sane_egrep '^0+$' >/dev/null 2>&1 +} + # Sanitize the local git environment for use within a submodule. We # can't simply use clear_local_git_env since we want to preserve some # of the settings from GIT_CONFIG_PARAMETERS. @@ -780,7 +785,7 @@ cmd_summary() { while read -r mod_src mod_dst sha1_src sha1_dst status name do if test -z "$cached" && - test $sha1_dst = 0000000000000000000000000000000000000000 + is_zero_oid $sha1_dst then case "$mod_dst" in 160000) |