Skip to content

Commit 3221177

Browse files
committed
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
2 parents 4f3036c + 7951a01 commit 3221177

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t4038-diff-combined.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -480,18 +480,18 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names'
480480
git branch side1d &&
481481
git branch side2d &&
482482
git checkout side1d &&
483-
test_seq 1 10 >$(printf "file\twith\ttabs") &&
483+
test_seq 1 10 >"$(printf "file\twith\ttabs")" &&
484484
git add file* &&
485485
git commit -m with &&
486486
git checkout side2d &&
487-
test_seq 1 9 >$(printf "i\tam\ttabbed") &&
488-
echo ten >>$(printf "i\tam\ttabbed") &&
487+
test_seq 1 9 >"$(printf "i\tam\ttabbed")" &&
488+
echo ten >>"$(printf "i\tam\ttabbed")" &&
489489
git add *tabbed &&
490490
git commit -m iam &&
491491
git checkout -b funny-names-mergery side1d &&
492492
git merge --no-commit side2d &&
493493
git rm *tabs &&
494-
echo eleven >>$(printf "i\tam\ttabbed") &&
494+
echo eleven >>"$(printf "i\tam\ttabbed")" &&
495495
git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" &&
496496
git add fickle* &&
497497
git commit

0 commit comments

Comments
 (0)