contrib/examples/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 perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg' "${_f}" done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elia Pinto committed
Dec 22, 2015 at 15:10 UTC
1a3655264ebb238692b3666afe338e094fdb3609
1 file changed
+2
-2
contrib/examples/git-merge.sh
+2
-2
@@ -523,10 +523,10 @@ do
523
524
if test "$exit" -eq 1
525
then
526
- cnt=`{
526
+ cnt=$({
527
git diff-files --name-only
528
git ls-files --unmerged
529
- } | wc -l`
529
+ } | wc -l)
530
if test $best_cnt -le 0 || test $cnt -le $best_cnt
531
then
532
best_strategy=$strategy