Skip to content

Commit

Permalink
git-merge.sh: use the $( ... ) construct for command substitution
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Elia Pinto authored and Junio C Hamano committed Apr 17, 2014
1 parent 1b3cddd commit 34da37c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions contrib/examples/git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -341,15 +341,15 @@ 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"
else
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"
Expand Down

0 comments on commit 34da37c

Please sign in to comment.