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
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-16 13:28:09 +0300
committerJunio C Hamano <gitster@pobox.com>2019-04-16 13:28:09 +0300
commit322117755950a1b69129e1b9bb5d494a3ee53491 (patch)
tree1d3d5bdd11019c79de2d4ef6f21e6b4898d3aa84 /t
parent4f3036cfa1ffe2470f1afafe541fea8d58d9282b (diff)
parent7951a016a55eb9e4698a8dc5805a5724515bf589 (diff)
Merge branch 'tz/t4038-bash-redirect-target-workaround'
Work-around extra warning from bash in our tests. * tz/t4038-bash-redirect-target-workaround: t4038-diff-combined: quote paths with whitespace
Diffstat (limited to 't')
-rwxr-xr-xt/t4038-diff-combined.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index 07b49f6d6d..d4afe12554 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -480,18 +480,18 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names'
git branch side1d &&
git branch side2d &&
git checkout side1d &&
- test_seq 1 10 >$(printf "file\twith\ttabs") &&
+ test_seq 1 10 >"$(printf "file\twith\ttabs")" &&
git add file* &&
git commit -m with &&
git checkout side2d &&
- test_seq 1 9 >$(printf "i\tam\ttabbed") &&
- echo ten >>$(printf "i\tam\ttabbed") &&
+ test_seq 1 9 >"$(printf "i\tam\ttabbed")" &&
+ echo ten >>"$(printf "i\tam\ttabbed")" &&
git add *tabbed &&
git commit -m iam &&
git checkout -b funny-names-mergery side1d &&
git merge --no-commit side2d &&
git rm *tabs &&
- echo eleven >>$(printf "i\tam\ttabbed") &&
+ echo eleven >>"$(printf "i\tam\ttabbed")" &&
git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" &&
git add fickle* &&
git commit