Skip to content

Commit 4eb6678

Browse files
committed
Merge branch 'ep/t6423-modernize'
Code clean-up. * ep/t6423-modernize: t6423-merge-rename-directories.sh: use the $(...) construct
2 parents 94cb657 + c614beb commit 4eb6678

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

t/t6423-merge-rename-directories.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4421,14 +4421,14 @@ test_setup_12c1 () {
44214421

44224422
git checkout A &&
44234423
git mv node2/ node1/ &&
4424-
for i in `git ls-files`; do echo side A >>$i; done &&
4424+
for i in $(git ls-files); do echo side A >>$i; done &&
44254425
git add -u &&
44264426
test_tick &&
44274427
git commit -m "A" &&
44284428

44294429
git checkout B &&
44304430
git mv node1/ node2/ &&
4431-
for i in `git ls-files`; do echo side B >>$i; done &&
4431+
for i in $(git ls-files); do echo side B >>$i; done &&
44324432
git add -u &&
44334433
test_tick &&
44344434
git commit -m "B"
@@ -4511,7 +4511,7 @@ test_setup_12c2 () {
45114511

45124512
git checkout A &&
45134513
git mv node2/ node1/ &&
4514-
for i in `git ls-files`; do echo side A >>$i; done &&
4514+
for i in $(git ls-files); do echo side A >>$i; done &&
45154515
git add -u &&
45164516
echo leaf5 >node1/leaf5 &&
45174517
git add node1/leaf5 &&
@@ -4520,7 +4520,7 @@ test_setup_12c2 () {
45204520

45214521
git checkout B &&
45224522
git mv node1/ node2/ &&
4523-
for i in `git ls-files`; do echo side B >>$i; done &&
4523+
for i in $(git ls-files); do echo side B >>$i; done &&
45244524
git add -u &&
45254525
echo leaf6 >node2/leaf6 &&
45264526
git add node2/leaf6 &&
@@ -4759,7 +4759,7 @@ test_setup_12f () {
47594759
echo g >dir/subdir/tweaked/g &&
47604760
echo h >dir/subdir/tweaked/h &&
47614761
test_seq 20 30 >dir/subdir/tweaked/Makefile &&
4762-
for i in `test_seq 1 88`; do
4762+
for i in $(test_seq 1 88); do
47634763
echo content $i >dir/unchanged/file_$i
47644764
done &&
47654765
git add . &&

0 commit comments

Comments
 (0)