mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-01-25 00:43:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tg/test-index-v4' into maint

Browse Source 
A test fix.

* tg/test-index-v4:
  t1700: make test pass with index-v4
This commit is contained in:
Junio C Hamano 2015-03-28 09:33:14 -07:00
commit b265061937
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
t/t1700-split-index.sh
View File

@ -10,9 +10,18 @@ sane_unset GIT_TEST_SPLIT_INDEX
test_expect_success 'enable split index' ' test_expect_success 'enable split index' '
git update-index --split-index && git update-index --split-index &&
test-dump-split-index .git/index >actual && test-dump-split-index .git/index >actual &&
indexversion=$(test-index-version <.git/index) &&
if test "$indexversion" = "4"
then
own=432ef4b63f32193984f339431fd50ca796493569
base=508851a7f0dfa8691e9f69c7f055865389012491
else
own=8299b0bcd1ac364e5f1d7768efb62fa2da79a339
base=39d890139ee5356c7ef572216cebcd27aa41f9df
fi &&
cat >expect <<EOF && cat >expect <<EOF &&
own 8299b0bcd1ac364e5f1d7768efb62fa2da79a339 own $own
base 39d890139ee5356c7ef572216cebcd27aa41f9df base $base
replacements: replacements:
deletions: deletions:
EOF EOF
@ -30,7 +39,7 @@ EOF
test-dump-split-index .git/index | sed "/^own/d" >actual && test-dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<EOF && cat >expect <<EOF &&
base 39d890139ee5356c7ef572216cebcd27aa41f9df base $base
100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one
replacements: replacements:
deletions: deletions: