kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sg/split-index-test' into maint 

Test updates.

* sg/split-index-test:
  t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index
  t1700-split-index: drop unnecessary 'grep'
maint
Junio C Hamano 2018-11-21 22:57:57 +09:00
parent 3ae0ac65cf 456d7cd3a9
commit 85f6afc28b
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
t/t0090-cache-tree.sh
View File

@ -261,13 +261,16 @@ test_expect_success 'no phantom error when switching trees' '
' '


test_expect_success 'switching trees does not invalidate shared index' ' test_expect_success 'switching trees does not invalidate shared index' '
git update-index --split-index && (
>split && sane_unset GIT_TEST_SPLIT_INDEX &&
git add split && git update-index --split-index &&
test-tool dump-split-index .git/index | grep -v ^own >before && >split &&
git commit -m "as-is" && git add split &&
test-tool dump-split-index .git/index | grep -v ^own >after && test-tool dump-split-index .git/index | grep -v ^own >before &&
test_cmp before after git commit -m "as-is" &&
test-tool dump-split-index .git/index | grep -v ^own >after &&
test_cmp before after
)
' '


test_done test_done

2
t/t1700-split-index.sh
View File

@ -67,7 +67,7 @@ test_expect_success 'disable split index' '
EOF EOF
test_cmp ls-files.expect ls-files.actual && 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 && test-tool dump-split-index .git/index | sed "/^own/d" >actual &&
cat >expect <<-EOF && cat >expect <<-EOF &&
not a split index not a split index