Commit cff90bdc authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'sg/split-index-test'

Test updates.

* sg/split-index-test:
  t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index
  t1700-split-index: drop unnecessary 'grep'
parents f52b7eea 456d7cd3
......@@ -261,6 +261,8 @@ test_expect_success 'no phantom error when switching trees' '
'
test_expect_success 'switching trees does not invalidate shared index' '
(
sane_unset GIT_TEST_SPLIT_INDEX &&
git update-index --split-index &&
>split &&
git add split &&
......@@ -268,6 +270,7 @@ test_expect_success 'switching trees does not invalidate shared index' '
git commit -m "as-is" &&
test-tool dump-split-index .git/index | grep -v ^own >after &&
test_cmp before after
)
'
test_done
......@@ -57,7 +57,7 @@ test_expect_success 'disable split index' '
EOF
test_cmp ls-files.expect ls-files.actual &&
BASE=$(test-tool dump-split-index .git/index | grep "^own" | sed "s/own/base/") &&
BASE=$(test-tool dump-split-index .git/index | sed -n "s/^own/base/p") &&
test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<-EOF &&
not a split index
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment