Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-24 20:30:53 +0300
committerJunio C Hamano <gitster@pobox.com>2018-09-24 20:30:53 +0300
commitcff90bdc5c8c8c0b0e3b8a1f32f220f0aba7af55 (patch)
treec5a80ef71ebab74fb74d6c8a1572877f3050167d
parentf52b7eea44281340e691e5ea89aaac831d2ac65f (diff)
parent456d7cd3a96bdc8b14af6440051805de8a581364 (diff)
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'
-rwxr-xr-xt/t0090-cache-tree.sh17
-rwxr-xr-xt/t1700-split-index.sh2
2 files changed, 11 insertions, 8 deletions
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 94fcb4a78e..504334e552 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -261,13 +261,16 @@ test_expect_success 'no phantom error when switching trees' '
'
test_expect_success 'switching trees does not invalidate shared index' '
- git update-index --split-index &&
- >split &&
- git add split &&
- test-tool dump-split-index .git/index | grep -v ^own >before &&
- git commit -m "as-is" &&
- test-tool dump-split-index .git/index | grep -v ^own >after &&
- test_cmp before after
+ (
+ sane_unset GIT_TEST_SPLIT_INDEX &&
+ git update-index --split-index &&
+ >split &&
+ git add split &&
+ test-tool dump-split-index .git/index | grep -v ^own >before &&
+ git commit -m "as-is" &&
+ test-tool dump-split-index .git/index | grep -v ^own >after &&
+ test_cmp before after
+ )
'
test_done
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index b3b4d83eaf..be22398a85 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -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