Thread (22 messages) flat view 22 messages, 3 authors, 2016-06-15
STALE3728d

Revision v2 of 3 in this series.

Revisions (3)
  1. v2 current
  2. v3 [diff vs current]
  3. v4 [diff vs current]

[PATCH/RFC v2 05/16] t2104: Don't fail for index versions other than [23]

From: Thomas Gummerer <hidden>
Date: 2016-06-15 22:54:25
Subsystem: the rest · Maintainer: Linus Torvalds

t2104 currently checks for the exact index version 2 or 3,
depending if there is a skip-worktree flag or not. Other
index versions do not use extended flags and thus cannot
be tested for version changes.

Make this test update the index to version 2 at the beginning
of the test. Testing the skip-worktree flags for the default
index format is still covered by t7011 and t7012.

Signed-off-by: Thomas Gummerer <redacted>
---
 t/t2104-update-index-skip-worktree.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh
index 1d0879b..4ef7d99 100755
--- a/t/t2104-update-index-skip-worktree.sh
+++ b/t/t2104-update-index-skip-worktree.sh
@@ -25,7 +25,8 @@ test_expect_success 'setup' '
 	mkdir sub &&
 	touch ./1 ./2 sub/1 sub/2 &&
 	git add 1 2 sub/1 sub/2 &&
-	git ls-files -t | test_cmp expect.full -
+	git ls-files -t | test_cmp expect.full - &&
+	git update-index --index-version=2
 '
 
 test_expect_success 'index is at version 2' '
-- 
1.7.10.GIT
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help