development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elia Pinto 2022-03-13 17:28:29 +00:00 committed by Junio C Hamano
parent 4c53a8c20f
commit c614beb933
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
t/t6423-merge-rename-directories.sh
View file

@ -4421,14 +4421,14 @@ test_setup_12c1 () {
git checkout A && git checkout A &&
git mv node2/ node1/ && 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 && git add -u &&
test_tick && test_tick &&
git commit -m "A" && git commit -m "A" &&
git checkout B && git checkout B &&
git mv node1/ node2/ && 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 && git add -u &&
test_tick && test_tick &&
git commit -m "B" git commit -m "B"
@ -4511,7 +4511,7 @@ test_setup_12c2 () {
git checkout A && git checkout A &&
git mv node2/ node1/ && 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 && git add -u &&
echo leaf5 >node1/leaf5 && echo leaf5 >node1/leaf5 &&
git add node1/leaf5 && git add node1/leaf5 &&
@ -4520,7 +4520,7 @@ test_setup_12c2 () {
git checkout B && git checkout B &&
git mv node1/ node2/ && 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 && git add -u &&
echo leaf6 >node2/leaf6 && echo leaf6 >node2/leaf6 &&
git add node2/leaf6 && git add node2/leaf6 &&
@ -4759,7 +4759,7 @@ test_setup_12f () {
echo g >dir/subdir/tweaked/g && echo g >dir/subdir/tweaked/g &&
echo h >dir/subdir/tweaked/h && echo h >dir/subdir/tweaked/h &&
test_seq 20 30 >dir/subdir/tweaked/Makefile && 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 echo content $i >dir/unchanged/file_$i
done && done &&
git add . && git add . &&