Re: [PATCH] t1700: make test pass with index-v4
Thomas Gummerer t.gumme...@gmail.com writes: 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. I am more interested to see how you managed to use index v4 in the tests be described next to when run with index v4. I thought we were controling these things fairly tightly (e.g. we disable hooks, move $HOME to avoid getting affected by your personal settings, etc.). Thanks. Signed-off-by: Thomas Gummerer t.gumme...@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 0one replacements: deletions: -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] t1700: make test pass with index-v4
On 03/20, Junio C Hamano wrote: Thomas Gummerer t.gumme...@gmail.com writes: 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. I am more interested to see how you managed to use index v4 in the tests be described next to when run with index v4. I thought we were controling these things fairly tightly (e.g. we disable hooks, move $HOME to avoid getting affected by your personal settings, etc.). The tests can be run with index-v4 by setting TEST_GIT_INDEX_VERSION in config.mak. This configuration was introduced in 5d9fc88 test-lib: allow setting the index format version. Thanks. Signed-off-by: Thomas Gummerer t.gumme...@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: -- Thomas Gummerer -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] t1700: make test pass with index-v4
Thomas Gummerer t.gumme...@gmail.com writes: On 03/20, Junio C Hamano wrote: Thomas Gummerer t.gumme...@gmail.com writes: 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. I am more interested to see how you managed to use index v4 in the tests be described next to when run with index v4. I thought we were controling these things fairly tightly (e.g. we disable hooks, move $HOME to avoid getting affected by your personal settings, etc.). The tests can be run with index-v4 by setting TEST_GIT_INDEX_VERSION in config.mak. This configuration was introduced in 5d9fc88 test-lib: allow setting the index format version. An updated patch to mention when run with TEST_GIT_INDEX_VERSION=4 in the log message was what I was asking for ;-) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
