From: Thomas Gummerer <t.gummerer@gmail.com>
To: git@vger.kernel.org
Cc: "Thomas Gummerer" <t.gummerer@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH] t1700: make test pass with index-v4
Date: Fri, 20 Mar 2015 16:09:24 +0100 [thread overview]
Message-ID: <1426864165-7334-1-git-send-email-t.gummerer@gmail.com> (raw)
The different index versions have different sha-1 checksums. Those
checksums are checked in t1700, which makes it fail when run with index
v4. Fix it.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
---
t/t1700-split-index.sh | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 94fb473..92f7298 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:
--
2.3.3.377.gdac1145
next reply other threads:[~2015-03-20 15:09 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 15:09 Thomas Gummerer [this message]
2015-03-20 17:23 ` [PATCH] t1700: make test pass with index-v4 Junio C Hamano
2015-03-20 17:37 ` Thomas Gummerer
2015-03-20 18:06 ` Junio C Hamano
2015-03-20 18:20 ` [PATCH v2] " Thomas Gummerer
2015-03-20 19:38 ` Junio C Hamano
2015-03-20 19:59 ` Thomas Gummerer
2015-03-20 21:43 ` [PATCH 0/2] fix test suite with split index Thomas Gummerer
2015-03-20 21:43 ` [PATCH 1/2] test-lib: allow using split index in the test suite Thomas Gummerer
2015-03-20 21:55 ` Junio C Hamano
2015-03-20 22:12 ` Thomas Gummerer
2015-03-20 21:43 ` [PATCH 2/2] read-cache: fix reading of split index Thomas Gummerer
2015-03-24 13:02 ` Duy Nguyen
2015-03-24 17:00 ` [PATCH] read-cache: tighten checks for do_read_index Thomas Gummerer
2015-03-24 21:33 ` Junio C Hamano
2015-03-24 21:51 ` Thomas Gummerer
2015-03-24 17:07 ` [PATCH 2/2] read-cache: fix reading of split index Thomas Gummerer
2015-03-24 17:19 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426864165-7334-1-git-send-email-t.gummerer@gmail.com \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).