Re: [PATCH v2 0/3] Easier access to index-v4
Thomas Gummerer t.gumme...@gmail.com writes: previous round was at $gmane/242198. Since then I've squashed the fixes suggested by Junio, added a test showing what should happen if an index file is present and GIT_INDEX_VERSION is set and fixed the typo found by Eric. Looks good; thanks. -- 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 v2 0/3] Easier access to index-v4
Junio C Hamano gits...@pobox.com writes:
Thomas Gummerer t.gumme...@gmail.com writes:
previous round was at $gmane/242198.
Since then I've squashed the fixes suggested by Junio, added a test
showing what should happen if an index file is present and
GIT_INDEX_VERSION is set and fixed the typo found by Eric.
Looks good; thanks.
Tests, seem to leak these unnecessary diag (not limited to t0010).
sh t0010-racy-git.sh
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version 3
ok 1 - Racy GIT trial #0 part A
ok 2 - Racy GIT trial #0 part B
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version 3
...
# passed all 10 test(s)
1..10
The same thing under prove.
*** prove ***
t0010-racy-git.sh .. warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 2/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 4/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 6/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 8/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. ok
All tests successful.
I suspect the real culprit is the early part in test-lib.sh that
sets GIT_INDEX_VERSION explicitly from TEST_GIT_INDEX_VERSION when
the latter is not even specified.
Something along this line, perhaps?
t/test-lib.sh | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 492f81f..01a98cb 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -108,8 +108,11 @@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
export EDITOR
-GIT_INDEX_VERSION=$TEST_GIT_INDEX_VERSION
-export GIT_INDEX_VERSION
+if test -n ${TEST_GIT_INDEX_VERSION+isset}
+then
+ GIT_INDEX_VERSION=$TEST_GIT_INDEX_VERSION
+ export GIT_INDEX_VERSION
+fi
# Add libc MALLOC and MALLOC_PERTURB test
# only if we are not executing the test with valgrind
--
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 v2 0/3] Easier access to index-v4
Junio C Hamano gits...@pobox.com writes:
Junio C Hamano gits...@pobox.com writes:
Thomas Gummerer t.gumme...@gmail.com writes:
previous round was at $gmane/242198.
Since then I've squashed the fixes suggested by Junio, added a test
showing what should happen if an index file is present and
GIT_INDEX_VERSION is set and fixed the typo found by Eric.
Looks good; thanks.
Tests, seem to leak these unnecessary diag (not limited to t0010).
sh t0010-racy-git.sh
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version 3
ok 1 - Racy GIT trial #0 part A
ok 2 - Racy GIT trial #0 part B
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version 3
...
# passed all 10 test(s)
1..10
The same thing under prove.
*** prove ***
t0010-racy-git.sh .. warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 2/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 4/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 6/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. 8/? warning: GIT_INDEX_VERSION set, but the value is
invalid.
Using version 3
t0010-racy-git.sh .. ok
All tests successful.
I suspect the real culprit is the early part in test-lib.sh that
sets GIT_INDEX_VERSION explicitly from TEST_GIT_INDEX_VERSION when
the latter is not even specified.
Something along this line, perhaps?
Sorry about this, I didn't run the test suite without
TEST_GIT_INDEX_VERSION in config.mak which I obviously should have.
Yes, this looks good to me, thanks!
t/test-lib.sh | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 492f81f..01a98cb 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -108,8 +108,11 @@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
export EDITOR
-GIT_INDEX_VERSION=$TEST_GIT_INDEX_VERSION
-export GIT_INDEX_VERSION
+if test -n ${TEST_GIT_INDEX_VERSION+isset}
+then
+ GIT_INDEX_VERSION=$TEST_GIT_INDEX_VERSION
+ export GIT_INDEX_VERSION
+fi
# Add libc MALLOC and MALLOC_PERTURB test
# only if we are not executing the test with valgrind
--
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 v2 0/3] Easier access to index-v4
Thomas Gummerer t.gumme...@gmail.com writes: Something along this line, perhaps? Sorry about this, I didn't run the test suite without TEST_GIT_INDEX_VERSION in config.mak which I obviously should have. Yes, this looks good to me, thanks! OK, will squash it (but using VAR:+isset instead of VAR+isset to allow people to set it to empty to disable) into the relevant patch. Thanks. -- 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
[PATCH v2 0/3] Easier access to index-v4
Hi, previous round was at $gmane/242198. Thanks to Junio, Eric and Duy for comments on the previous round. Since then I've squashed the fixes suggested by Junio, added a test showing what should happen if an index file is present and GIT_INDEX_VERSION is set and fixed the typo found by Eric. Thomas Gummerer (3): introduce GIT_INDEX_VERSION environment variable test-lib: allow setting the index format version read-cache: add index.version config variable Documentation/config.txt | 4 ++ Documentation/git.txt | 5 +++ Makefile | 7 read-cache.c | 38 +- t/t1600-index.sh | 76 +++ t/t2104-update-index-skip-worktree.sh | 2 + t/test-lib-functions.sh | 5 +++ t/test-lib.sh | 3 ++ 8 files changed, 139 insertions(+), 1 deletion(-) create mode 100755 t/t1600-index.sh -- 1.9.0.1.ge0caaa8.dirty -- 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
