diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-03-28 09:33:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-28 09:33:14 -0700 |
| commit | b265061937b2b0077a37b44a463fe60e1d55156c (patch) | |
| tree | 117339db26768e1f6c2f8a7a3dde676bb3975cdf | |
| parent | Merge branch 'nd/doc-git-index-version' into maint (diff) | |
| parent | t1700: make test pass with index-v4 (diff) | |
| download | tgif-b265061937b2b0077a37b44a463fe60e1d55156c.tar.xz | |
Merge branch 'tg/test-index-v4' into maint
A test fix.
* tg/test-index-v4:
t1700: make test pass with index-v4
| -rwxr-xr-x | t/t1700-split-index.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index 94fb473e7c..92f7298fba 100755 --- a/t/t1700-split-index.sh +++ b/t/t1700-split-index.sh @@ -10,9 +10,18 @@ sane_unset GIT_TEST_SPLIT_INDEX test_expect_success 'enable split index' ' git update-index --split-index && 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 && -own 8299b0bcd1ac364e5f1d7768efb62fa2da79a339 -base 39d890139ee5356c7ef572216cebcd27aa41f9df +own $own +base $base replacements: deletions: EOF @@ -30,7 +39,7 @@ EOF test-dump-split-index .git/index | sed "/^own/d" >actual && cat >expect <<EOF && -base 39d890139ee5356c7ef572216cebcd27aa41f9df +base $base 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0 one replacements: deletions: |