Skip to contentSkip to conversation

t6423-merge-rename-directories.sh: use the $(...) construct

PATCH New Elia Pinto 1 participant 1 message Mar 13, 2022

lore
Share & tools
lore

Elia Pinto

author
#0 lore raw

PATCH v2 1/1 t6423-merge-rename-directories.sh: use the $(...) construct

The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes ....

The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character.

The patch was generated by:

for _f in $(find . -name "*.sh")
do

	shellcheck -i SC2006 -f diff ${_f} | ifne git apply -p2

done

and then carefully proof-read.

---
This is version 2 of the patch.

In this one, only the commit message is reformatted
https://lore.kernel.org/all/[email protected]/t/#md1eb17764414c2a26421b1213ee084912c434d3b

 t/t6423-merge-rename-directories.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
t/t6423-merge-rename-directories.sh +5 -5
index 5b81a130e9..479db32cd6 100755
@@ -4421,14 +4421,14 @@ test_setup_12c1 () {
 
 		git checkout A &&
 		git mv node2/ node1/ &&
-		for i in `git ls-files`; do echo side A >>$i; done &&
+		for i in $(git ls-files); do echo side A >>$i; done &&
 		git add -u &&
 		test_tick &&
 		git commit -m "A" &&
 
 		git checkout B &&
 		git mv node1/ node2/ &&
-		for i in `git ls-files`; do echo side B >>$i; done &&
+		for i in $(git ls-files); do echo side B >>$i; done &&
 		git add -u &&
 		test_tick &&
 		git commit -m "B"
@@ -4511,7 +4511,7 @@ test_setup_12c2 () {
 
 		git checkout A &&
 		git mv node2/ node1/ &&
-		for i in `git ls-files`; do echo side A >>$i; done &&
+		for i in $(git ls-files); do echo side A >>$i; done &&
 		git add -u &&
 		echo leaf5 >node1/leaf5 &&
 		git add node1/leaf5 &&
@@ -4520,7 +4520,7 @@ test_setup_12c2 () {
 
 		git checkout B &&
 		git mv node1/ node2/ &&
-		for i in `git ls-files`; do echo side B >>$i; done &&
+		for i in $(git ls-files); do echo side B >>$i; done &&
 		git add -u &&
 		echo leaf6 >node2/leaf6 &&
 		git add node2/leaf6 &&
@@ -4759,7 +4759,7 @@ test_setup_12f () {
 		echo g >dir/subdir/tweaked/g &&
 		echo h >dir/subdir/tweaked/h &&
 		test_seq 20 30 >dir/subdir/tweaked/Makefile &&
-		for i in `test_seq 1 88`; do
+		for i in $(test_seq 1 88); do
 			echo content $i >dir/unchanged/file_$i
 		done &&
 		git add . &&
Signature · 1 line
2.35.1