undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0020-crlf.sh: use the $( ... ) construct for command substitution

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
   sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
done

and then carefully proof-read.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elia Pinto 2014-04-28 05:57:26 -07:00 committed by Junio C Hamano
parent 8fc5593c53
commit def226bdbb
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
t/t0020-crlf.sh
View File

@ -20,14 +20,14 @@ test_expect_success setup '
git commit -m initial && git commit -m initial &&
one=`git rev-parse HEAD:one` && one=$(git rev-parse HEAD:one) &&
dir=`git rev-parse HEAD:dir` && dir=$(git rev-parse HEAD:dir) &&
two=`git rev-parse HEAD:dir/two` && two=$(git rev-parse HEAD:dir/two) &&
three=`git rev-parse HEAD:three` && three=$(git rev-parse HEAD:three) &&
for w in Some extra lines here; do echo $w; done >>one && for w in Some extra lines here; do echo $w; done >>one &&
git diff >patch.file && git diff >patch.file &&
patched=`git hash-object --stdin <one` && patched=$(git hash-object --stdin <one) &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
echo happy. echo happy.
@ -111,7 +111,7 @@ test_expect_success 'update with autocrlf=input' '
} }
done && done &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -135,7 +135,7 @@ test_expect_success 'update with autocrlf=true' '
} }
done && done &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -158,9 +158,9 @@ test_expect_success 'checkout with autocrlf=true' '
break break
} }
done && done &&
test "$one" = `git hash-object --stdin <one` && test "$one" = $(git hash-object --stdin <one) &&
test "$two" = `git hash-object --stdin <dir/two` && test "$two" = $(git hash-object --stdin <dir/two) &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -184,9 +184,9 @@ test_expect_success 'checkout with autocrlf=input' '
git update-index -- $f git update-index -- $f
fi fi
done && done &&
test "$one" = `git hash-object --stdin <one` && test "$one" = $(git hash-object --stdin <one) &&
test "$two" = `git hash-object --stdin <dir/two` && test "$two" = $(git hash-object --stdin <dir/two) &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -200,7 +200,7 @@ test_expect_success 'apply patch (autocrlf=input)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply patch.file && git apply patch.file &&
test "$patched" = "`git hash-object --stdin <one`" || { test "$patched" = "$(git hash-object --stdin <one)" || {
echo "Eh? apply without index" echo "Eh? apply without index"
false false
} }
@ -213,7 +213,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --cached patch.file && git apply --cached patch.file &&
test "$patched" = `git rev-parse :one` || { test "$patched" = $(git rev-parse :one) || {
echo "Eh? apply with --cached" echo "Eh? apply with --cached"
false false
} }
@ -226,8 +226,8 @@ test_expect_success 'apply patch --index (autocrlf=input)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --index patch.file && git apply --index patch.file &&
test "$patched" = `git rev-parse :one` && test "$patched" = $(git rev-parse :one) &&
test "$patched" = `git hash-object --stdin <one` || { test "$patched" = $(git hash-object --stdin <one) || {
echo "Eh? apply with --index" echo "Eh? apply with --index"
false false
} }
@ -240,7 +240,7 @@ test_expect_success 'apply patch (autocrlf=true)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply patch.file && git apply patch.file &&
test "$patched" = "`remove_cr <one | git hash-object --stdin`" || { test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || {
echo "Eh? apply without index" echo "Eh? apply without index"
false false
} }
@ -253,7 +253,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --cached patch.file && git apply --cached patch.file &&
test "$patched" = `git rev-parse :one` || { test "$patched" = $(git rev-parse :one) || {
echo "Eh? apply without index" echo "Eh? apply without index"
false false
} }
@ -266,8 +266,8 @@ test_expect_success 'apply patch --index (autocrlf=true)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --index patch.file && git apply --index patch.file &&
test "$patched" = `git rev-parse :one` && test "$patched" = $(git rev-parse :one) &&
test "$patched" = "`remove_cr <one | git hash-object --stdin`" || { test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || {
echo "Eh? apply with --index" echo "Eh? apply with --index"
false false
} }