[PATCH 05/16] t2104: Don't fail when index version is 5
- From
Thomas Gummerer <t.gummerer@gmail.com>
- Date
- Aug 2, 2012, 11:01 UTC
- Message-ID
- <1343905326-23790-6-git-send-email-t.gummerer@gmail.com>
- In-Reply-To
- <1343905326-23790-1-git-send-email-t.gummerer@gmail.com>
The test t2104 currently checks if the index version is correctly reduced to 2/increased to 3, when an entry need extended flags, or doesn't use them anymore. Since index-v5 doesn't have extended flags (the extended flags are part of the normal flags), we simply add a check if the index version is 2/3 (whichever is correct for that test) or 5.
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> --- t/t2104-update-index-skip-worktree.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh index 1d0879b..e66f23e 100755 --- a/t/t2104-update-index-skip-worktree.sh +++ b/t/t2104-update-index-skip-worktree.sh @@ -28,8 +28,9 @@ test_expect_success 'setup' ' git ls-files -t | test_cmp expect.full - ' -test_expect_success 'index is at version 2' ' - test "$(test-index-version < .git/index)" = 2 +test_expect_success 'index is at version 2 or version 5' ' + test "$(test-index-version < .git/index)" = 2 || + test "$(test-index-version < .git/index)" = 5 ' test_expect_success 'update-index --skip-worktree' ' @@ -37,8 +38,9 @@ test_expect_success 'update-index --skip-worktree' ' git ls-files -t | test_cmp expect.skip - ' -test_expect_success 'index is at version 3 after having some skip-worktree entries' ' - test "$(test-index-version < .git/index)" = 3 +test_expect_success 'index is at version 3 or version 5 after having some skip-worktree entries' ' + test "$(test-index-version < .git/index)" = 3 || + test "$(test-index-version < .git/index)" = 5 ' test_expect_success 'ls-files -t' ' @@ -50,8 +52,9 @@ test_expect_success 'update-index --no-skip-worktree' ' git ls-files -t | test_cmp expect.full - ' -test_expect_success 'index version is back to 2 when there is no skip-worktree entry' ' - test "$(test-index-version < .git/index)" = 2 +test_expect_success 'index version is back to 2 or 5 when there is no skip-worktree entry' ' + test "$(test-index-version < .git/index)" = 2 || + test "$(test-index-version < .git/index)" = 5 ' test_done
-- 1.7.10.886.gdf6792c.dirty