Skip to content

Commit e869c5e

Browse files
tgummerergitster
authored andcommitted
t1700: make test pass with index-v4
The different index versions have different sha-1 checksums. Those checksums are checked in t1700, which makes it fail when the test suite is run with TEST_GIT_INDEX_VERSION=4. Fix it. Signed-off-by: Thomas Gummerer <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9874fca commit e869c5e

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

t/t1700-split-index.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,18 @@ sane_unset GIT_TEST_SPLIT_INDEX
1010
test_expect_success 'enable split index' '
1111
git update-index --split-index &&
1212
test-dump-split-index .git/index >actual &&
13+
indexversion=$(test-index-version <.git/index) &&
14+
if test "$indexversion" = "4"
15+
then
16+
own=432ef4b63f32193984f339431fd50ca796493569
17+
base=508851a7f0dfa8691e9f69c7f055865389012491
18+
else
19+
own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339
20+
base=39d890139ee5356c7ef572216cebcd27aa41f9df
21+
fi &&
1322
cat >expect <<EOF &&
14-
own 8299b0bcd1ac364e5f1d7768efb62fa2da79a339
15-
base 39d890139ee5356c7ef572216cebcd27aa41f9df
23+
own $own
24+
base $base
1625
replacements:
1726
deletions:
1827
EOF
@@ -30,7 +39,7 @@ EOF
3039
3140
test-dump-split-index .git/index | sed "/^own/d" >actual &&
3241
cat >expect <<EOF &&
33-
base 39d890139ee5356c7ef572216cebcd27aa41f9df
42+
base $base
3443
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one
3544
replacements:
3645
deletions:

0 commit comments

Comments
 (0)