diff options
| author |  Elia Pinto <gitter.spiros@gmail.com> | 2014-04-16 10:29:52 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-04-17 11:14:59 -0700 |
| commit | 34da37cc4230affae93483f6c51fca6beb6e6c64 (patch) | |
| tree | 40111cd2c5e3630d61b52e6552d014a5b55e1c99 | |
| parent | git-ls-remote.sh: use the $( ... ) construct for command substitution (diff) | |
| download | tgif-34da37cc4230affae93483f6c51fca6beb6e6c64.tar.xz | |
git-merge.sh: use the $( ... ) construct for command substitution
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>
| -rwxr-xr-x | contrib/examples/git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index a5e42a9f01..7e40f40c78 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -341,7 +341,7 @@ case "$use_strategies" in '') case "$#" in 1) - var="`git config --get pull.twohead`" + var="$(git config --get pull.twohead)" if test -n "$var" then use_strategies="$var" @@ -349,7 +349,7 @@ case "$use_strategies" in use_strategies="$default_twohead_strategies" fi ;; *) - var="`git config --get pull.octopus`" + var="$(git config --get pull.octopus)" if test -n "$var" then use_strategies="$var" |