undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4027: make hash-size independent

Browse Source 
Instead of hard-coding the length of an object ID, look this value up
using the translation tables.  Similarly, compute input data for invalid
submodule entries using the tables as well.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2019-10-28 00:59:01 +00:00 committed by Junio C Hamano
parent 79b0edc1a0
commit 45e2ef2b1d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
t/t4027-diff-submodule.sh
View File

@ -6,6 +6,7 @@ test_description='difference in submodules'
. "$TEST_DIRECTORY"/diff-lib.sh . "$TEST_DIRECTORY"/diff-lib.sh
test_expect_success setup ' test_expect_success setup '
test_oid_init &&
test_tick && test_tick &&
test_create_repo sub && test_create_repo sub &&
( (
@ -36,7 +37,8 @@ test_expect_success setup '
' '
test_expect_success 'git diff --raw HEAD' ' test_expect_success 'git diff --raw HEAD' '
git diff --raw --abbrev=40 HEAD >actual && hexsz=$(test_oid hexsz) &&
git diff --raw --abbrev=$hexsz HEAD >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -245,23 +247,21 @@ test_expect_success 'git diff (empty submodule dir)' '
' '
test_expect_success 'conflicted submodule setup' ' test_expect_success 'conflicted submodule setup' '
c=$(test_oid ff_1) &&
# 39 efs
c=fffffffffffffffffffffffffffffffffffffff &&
( (
echo "000000 $ZERO_OID 0 sub" && echo "000000 $ZERO_OID 0 sub" &&
echo "160000 1$c 1 sub" && echo "160000 1$c 1 sub" &&
echo "160000 2$c 2 sub" && echo "160000 2$c 2 sub" &&
echo "160000 3$c 3 sub" echo "160000 3$c 3 sub"
) | git update-index --index-info && ) | git update-index --index-info &&
echo >expect.nosub '\''diff --cc sub echo >expect.nosub "diff --cc sub
index 2ffffff,3ffffff..0000000 index 2ffffff,3ffffff..0000000
--- a/sub --- a/sub
+++ b/sub +++ b/sub
@@@ -1,1 -1,1 +1,1 @@@ @@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 2fffffffffffffffffffffffffffffffffffffff - Subproject commit 2$c
-Subproject commit 3fffffffffffffffffffffffffffffffffffffff -Subproject commit 3$c
++Subproject commit 0000000000000000000000000000000000000000'\'' && ++Subproject commit $ZERO_OID" &&
hh=$(git rev-parse HEAD) && hh=$(git rev-parse HEAD) &&
sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub