# [PATCH 03/14] t4006-diff-mode.sh: use the $( ... ) construct for command substitution 16 messages from 2014-04-30 to 2014-04-30. Participants: Elia Pinto, Matthieu Moy, Junio C Hamano. Thread: https://gitlist.dev/t/36554 ## Elia Pinto, 2014-04-30 16:22 Subject: [PATCH 01/14] t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-1-git-send-email-gitter.spiros%40gmail.com ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t3905-stash-include-untracked.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index a5e7e6b..f372fc8 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -96,8 +96,8 @@ test_expect_success 'stash pop after save --include-untracked leaves files untra git stash pop && git status --porcelain >actual && test_cmp expect actual && - test "1" = "`cat file2`" && - test untracked = "`cat untracked/untracked`" + test "1" = "$(cat file2)" && + test untracked = "$(cat untracked/untracked)" ' git clean --force --quiet -d -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:22 Subject: [PATCH 02/14] t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-2-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-2-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t3910-mac-os-precompose.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh index e4ba601..96941e9 100755 --- a/t/t3910-mac-os-precompose.sh +++ b/t/t3910-mac-os-precompose.sh @@ -14,13 +14,13 @@ then fi # create utf-8 variables -Adiarnfc=`printf '\303\204'` -Adiarnfd=`printf 'A\314\210'` +Adiarnfc=$(printf '\303\204') +Adiarnfd=$(printf 'A\314\210') -Odiarnfc=`printf '\303\226'` -Odiarnfd=`printf 'O\314\210'` -AEligatu=`printf '\303\206'` -Invalidu=`printf '\303\377'` +Odiarnfc=$(printf '\303\226') +Odiarnfd=$(printf 'O\314\210') +AEligatu=$(printf '\303\206') +Invalidu=$(printf '\303\377') #Create a string with 255 bytes (decomposed) @@ -35,7 +35,7 @@ Alongc=$Alongc$Alongc$Alongc$Alongc$Alongc #250 Byte Alongc=$Alongc$AEligatu$AEligatu #254 Byte test_expect_success "detect if nfd needed" ' - precomposeunicode=`git config core.precomposeunicode` && + precomposeunicode=$(git config core.precomposeunicode) && test "$precomposeunicode" = true && git config core.precomposeunicode true ' @@ -146,7 +146,7 @@ test_expect_success "respect git config --global core.precomposeunicode" ' git config --global core.precomposeunicode true && rm -rf .git && git init && - precomposeunicode=`git config core.precomposeunicode` && + precomposeunicode=$(git config core.precomposeunicode) && test "$precomposeunicode" = "true" ' -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:22 Subject: [PATCH 03/14] t4006-diff-mode.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-3-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-3-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4006-diff-mode.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index 0591149..76f643b 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -13,7 +13,7 @@ sed_script='s/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /' test_expect_success 'setup' ' echo frotz >rezrov && git update-index --add rezrov && - tree=`git write-tree` && + tree=$(git write-tree) && echo $tree ' -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:22 Subject: [PATCH 04/14] t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-4-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-4-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4010-diff-pathspec.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh index 2bb9736..bf07841 100755 --- a/t/t4010-diff-pathspec.sh +++ b/t/t4010-diff-pathspec.sh @@ -18,7 +18,7 @@ test_expect_success \ mkdir path1 && echo rezrov >path1/file1 && git update-index --add file0 path1/file1 && - tree=`git write-tree` && + tree=$(git write-tree) && echo "$tree" && echo nitfol >file0 && echo yomin >path1/file1 && @@ -131,7 +131,7 @@ test_expect_success 'diff multiple wildcard pathspecs' ' mkdir path2 && echo rezrov >path2/file1 && git update-index --add path2/file1 && - tree3=`git write-tree` && + tree3=$(git write-tree) && git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual && cat <<-\EOF >expect && path1/file1 -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:22 Subject: [PATCH 05/14] t4012-diff-binary.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-5-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-5-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4012-diff-binary.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 1215ae5..643d729 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -67,18 +67,18 @@ test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' ' git diff >output && sed -e "s/-CIT/xCIT/" broken && test_must_fail git apply --stat --summary broken 2>detected && - detected=`cat detected` && - detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && - detected=`sed -ne "${detected}p" broken` && + detected=$(cat detected) && + detected=$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") && + detected=$(sed -ne "${detected}p" broken) && test "$detected" = xCIT ' test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' ' git diff --binary | sed -e "s/-CIT/xCIT/" >broken && test_must_fail git apply --stat --summary broken 2>detected && - detected=`cat detected` && - detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && - detected=`sed -ne "${detected}p" broken` && + detected=$(cat detected) && + detected=$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") && + detected=$(sed -ne "${detected}p" broken) && test "$detected" = xCIT ' @@ -88,7 +88,7 @@ test_expect_success 'initial commit' 'git commit -a -m initial' test_expect_success 'diff-index with --binary' ' echo AIT >a && mv b e && echo CIT >c && cat e >d && git update-index --add --remove a b c d e && - tree0=`git write-tree` && + tree0=$(git write-tree) && git diff --cached --binary >current && git apply --stat --summary current ' @@ -96,7 +96,7 @@ test_expect_success 'diff-index with --binary' ' test_expect_success 'apply binary patch' ' git reset --hard && git apply --binary --index URL: https://gitlist.dev/e/1398874987-14873-6-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4013-diff-various.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index e77c09c..805b055 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -107,14 +107,14 @@ test_expect_success setup ' +*++ [initial] Initial EOF -V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'` +V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g') while read cmd do case "$cmd" in '' | '#'*) continue ;; esac - test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'` - pfx=`printf "%04d" $test_count` + test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g') + pfx=$(printf "%04d" $test_count) expect="$TEST_DIRECTORY/t4013/diff.$test" actual="$pfx-diff.$test" -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 07/14] t4014-format-patch.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-7-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-7-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4014-format-patch.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 9c80633..282bee4 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -43,7 +43,7 @@ test_expect_success setup ' test_expect_success "format-patch --ignore-if-in-upstream" ' git format-patch --stdout master..side >patch0 && - cnt=`grep "^From " patch0 | wc -l` && + cnt=$(grep "^From " patch0 | wc -l) && test $cnt = 3 ' @@ -52,7 +52,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" ' git format-patch --stdout \ --ignore-if-in-upstream master..side >patch1 && - cnt=`grep "^From " patch1 | wc -l` && + cnt=$(grep "^From " patch1 | wc -l) && test $cnt = 2 ' @@ -69,7 +69,7 @@ test_expect_success "format-patch doesn't consider merge commits" ' git checkout -b merger master && test_tick && git merge --no-ff slave && - cnt=`git format-patch -3 --stdout | grep "^From " | wc -l` && + cnt=$(git format-patch -3 --stdout | grep "^From " | wc -l) && test $cnt = 3 ' @@ -77,7 +77,7 @@ test_expect_success "format-patch result applies" ' git checkout -b rebuild-0 master && git am -3 patch0 && - cnt=`git rev-list master.. | wc -l` && + cnt=$(git rev-list master.. | wc -l) && test $cnt = 2 ' @@ -85,7 +85,7 @@ test_expect_success "format-patch --ignore-if-in-upstream result applies" ' git checkout -b rebuild-1 master && git am -3 patch1 && - cnt=`git rev-list master.. | wc -l` && + cnt=$(git rev-list master.. | wc -l) && test $cnt = 2 ' -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 08/14] t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-8-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-8-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4036-format-patch-signer-mime.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4036-format-patch-signer-mime.sh b/t/t4036-format-patch-signer-mime.sh index ba43f18..98d9713 100755 --- a/t/t4036-format-patch-signer-mime.sh +++ b/t/t4036-format-patch-signer-mime.sh @@ -42,7 +42,7 @@ test_expect_success 'attach and signoff do not duplicate mime headers' ' GIT_COMMITTER_NAME="はまの ふにおう" \ git format-patch -s --stdout -1 --attach >output && - test `grep -ci ^MIME-Version: output` = 1 + test $(grep -ci ^MIME-Version: output) = 1 ' -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 09/14] t4038-diff-combined.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-9-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-9-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4038-diff-combined.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh index 1019d7b..41913c3 100755 --- a/t/t4038-diff-combined.sh +++ b/t/t4038-diff-combined.sh @@ -94,7 +94,7 @@ test_expect_success 'setup for --cc --raw' ' blob=$(echo file | git hash-object --stdin -w) && base_tree=$(echo "100644 blob $blob file" | git mktree) && trees= && - for i in `test_seq 1 40` + for i in $(test_seq 1 40) do blob=$(echo file$i | git hash-object --stdin -w) && trees="$trees$(echo "100644 blob $blob file" | git mktree)$LF" -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 10/14] t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-10-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-10-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4057-diff-combined-paths.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh index 097e632..dff36b7 100755 --- a/t/t4057-diff-combined-paths.sh +++ b/t/t4057-diff-combined-paths.sh @@ -5,7 +5,7 @@ test_description='combined diff show only paths that are different to all parent . ./test-lib.sh # verify that diffc.expect matches output of -# `git diff -c --name-only HEAD HEAD^ HEAD^2` +# $(git diff -c --name-only HEAD HEAD^ HEAD^2) diffc_verify () { git diff -c --name-only HEAD HEAD^ HEAD^2 >diffc.actual && test_cmp diffc.expect diffc.actual -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 11/14] t4116-apply-reverse.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-11-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-11-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4116-apply-reverse.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh index 1e4d438..ce8567f 100755 --- a/t/t4116-apply-reverse.sh +++ b/t/t4116-apply-reverse.sh @@ -30,10 +30,10 @@ test_expect_success setup ' test_expect_success 'apply in forward' ' - T0=`git rev-parse "second^{tree}"` && + T0=$(git rev-parse "second^{tree}") && git reset --hard initial && git apply --index --binary patch && - T1=`git write-tree` && + T1=$(git write-tree) && test "$T0" = "$T1" ' @@ -62,22 +62,22 @@ test_expect_success 'setup separate repository lacking postimage' ' test_expect_success 'apply in forward without postimage' ' - T0=`git rev-parse "second^{tree}"` && + T0=$(git rev-parse "second^{tree}") && ( cd initial && git apply --index --binary ../patch && - T1=`git write-tree` && + T1=$(git write-tree) && test "$T0" = "$T1" ) ' test_expect_success 'apply in reverse without postimage' ' - T0=`git rev-parse "initial^{tree}"` && + T0=$(git rev-parse "initial^{tree}") && ( cd second && git apply --index --binary --reverse ../patch && - T1=`git write-tree` && + T1=$(git write-tree) && test "$T0" = "$T1" ) ' -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 12/14] t4119-apply-config.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-12-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-12-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4119-apply-config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh index 3d0384d..c393be6 100755 --- a/t/t4119-apply-config.sh +++ b/t/t4119-apply-config.sh @@ -68,7 +68,7 @@ test_expect_success 'apply --whitespace=strip from config' ' check_result sub/file1 ' -D=`pwd` +D=$(pwd) test_expect_success 'apply --whitespace=strip in subdir' ' -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 13/14] t4204-patch-id.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-13-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-13-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t4204-patch-id.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh index d2c930d..7940f6f 100755 --- a/t/t4204-patch-id.sh +++ b/t/t4204-patch-id.sh @@ -45,8 +45,8 @@ test_expect_success 'patch-id supports git-format-patch output' ' git checkout same && git format-patch -1 --stdout | calc_patch_id same && test_cmp patch-id_master patch-id_same && - set `git format-patch -1 --stdout | git patch-id` && - test "$2" = `git rev-parse HEAD` + set $(git format-patch -1 --stdout | git patch-id) && + test "$2" = $(git rev-parse HEAD) ' test_expect_success 'whitespace is irrelevant in footer' ' -- 1.7.10.4 ``` ## Elia Pinto, 2014-04-30 16:23 Subject: [PATCH 14/14] t5000-tar-tree.sh: use the $( ... ) construct for command substitution Message-ID: <1398874987-14873-14-git-send-email-gitter.spiros@gmail.com> URL: https://gitlist.dev/e/1398874987-14873-14-git-send-email-gitter.spiros%40gmail.com In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` 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 sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto --- t/t5000-tar-tree.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 1cf0a4e..74fc5a8 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -123,7 +123,7 @@ test_expect_success \ 'add files to repository' \ 'find a -type f | xargs git update-index --add && find a -type l | xargs git update-index --add && - treeid=`git write-tree` && + treeid=$(git write-tree) && echo $treeid >treeid && git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ git commit-tree $treeid remote.tar && test_must_fail git archive --remote=. $sha1 >remote.tar @@ -215,7 +215,7 @@ test_expect_success 'clients cannot access unreachable commits' ' test_expect_success 'upload-archive can allow unreachable commits' ' test_commit unreachable1 && - sha1=`git rev-parse HEAD` && + sha1=$(git rev-parse HEAD) && git reset --hard HEAD^ && git archive $sha1 >remote.tar && test_config uploadarchive.allowUnreachable true && -- 1.7.10.4 ``` ## Matthieu Moy, 2014-04-30 16:42 Subject: Re: [PATCH 01/14] t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution Message-ID: URL: https://gitlist.dev/e/vpq4n1alqf2.fsf%40anie.imag.fr In-Reply-To: <1398874987-14873-1-git-send-email-gitter.spiros@gmail.com> ``` Patches 1/14 are Reviewed-by: Matthieu Moy On a side note, reviewing patches by batches of 14 patches actually turns out to be much less convenient for me than reviewing larger batches. If I'm counting correctly, there should be around 100 patches remaining. I'd suggest that the next batch contain them all (probably publishing the branch somewhere and posting a merge request here would be better to avoid sending 100 mails). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ``` ## Junio C Hamano, 2014-04-30 18:07 Subject: Re: [PATCH 01/14] t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution Message-ID: URL: https://gitlist.dev/e/xmqqiopqg08a.fsf%40gitster.dls.corp.google.com In-Reply-To: ``` Matthieu Moy writes: > Patches 1/14 are > > Reviewed-by: Matthieu Moy > > On a side note, reviewing patches by batches of 14 patches actually > turns out to be much less convenient for me than reviewing larger > batches. > > If I'm counting correctly, there should be around 100 patches remaining. > I'd suggest that the next batch contain them all (probably publishing > the branch somewhere and posting a merge request here would be better to > avoid sending 100 mails). I eyeballed these 28 patches so far (but not this round yet) and each of the batches did fit my attention span for a series while looking at other topics also in flight. Tastes and preferences differ between us, I guess. I however can, and am very inclined to, trust your review blindly and apply further patches on this topic with your Reviewed-by: without even looking at the patches myself. If "give us the whole" is more convenient for you, I am perfectly happy with that approach. Thanks for reviewing. ```