diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-13 02:24:13 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-14 11:02:00 +0900 |
| commit | 8125a58b912e52eba7889e1dba9fe6d711b0ffdf (patch) | |
| tree | 38a6b544562892c7d8bdb77a78e4ecb282f13395 /t/t4027-diff-submodule.sh | |
| parent | 198857bf7ed1dc2403884c1e6900650b50e0f0a9 (diff) | |
| download | git-8125a58b912e52eba7889e1dba9fe6d711b0ffdf.tar.gz | |
t: switch $_z40 to $ZERO_OID
Switch all uses of $_z40 to $ZERO_OID so that they work correctly with
larger hashes. This commit was created by using the following sed
command to modify all files in the t directory except t/test-lib.sh:
sed -i 's/\$_z40/$ZERO_OID/g'
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4027-diff-submodule.sh')
| -rwxr-xr-x | t/t4027-diff-submodule.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh index 2ffd11a142..6304130ad4 100755 --- a/t/t4027-diff-submodule.sh +++ b/t/t4027-diff-submodule.sh @@ -31,7 +31,7 @@ test_expect_success setup ' cd sub && git rev-list HEAD ) && - echo ":160000 160000 $3 $_z40 M sub" >expect && + echo ":160000 160000 $3 $ZERO_OID M sub" >expect && subtip=$3 subprev=$2 ' @@ -250,7 +250,7 @@ test_expect_success 'conflicted submodule setup' ' # 39 efs c=fffffffffffffffffffffffffffffffffffffff && ( - echo "000000 $_z40 0 sub" && + echo "000000 $ZERO_OID 0 sub" && echo "160000 1$c 1 sub" && echo "160000 2$c 2 sub" && echo "160000 3$c 3 sub" @@ -265,7 +265,7 @@ index 2ffffff,3ffffff..0000000 ++Subproject commit 0000000000000000000000000000000000000000'\'' && hh=$(git rev-parse HEAD) && - sed -e "s/$_z40/$hh/" expect.nosub >expect.withsub + sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub ' |