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

git-merge.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-16 10:29:52 -07:00 committed by Junio C Hamano
parent 1b3cddd288
commit 34da37cc42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/examples/git-merge.sh
View File

@ -341,7 +341,7 @@ case "$use_strategies" in
'') '')
case "$#" in case "$#" in
1) 1)
var="`git config --get pull.twohead`" var="$(git config --get pull.twohead)"
if test -n "$var" if test -n "$var"
then then
use_strategies="$var" use_strategies="$var"
@ -349,7 +349,7 @@ case "$use_strategies" in
use_strategies="$default_twohead_strategies" use_strategies="$default_twohead_strategies"
fi ;; fi ;;
*) *)
var="`git config --get pull.octopus`" var="$(git config --get pull.octopus)"
if test -n "$var" if test -n "$var"
then then
use_strategies="$var" use_strategies="$var"