diff options
| author |  Elia Pinto <gitter.spiros@gmail.com> | 2015-12-22 15:10:25 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-12-27 15:33:13 -0800 |
| commit | 1a3655264ebb238692b3666afe338e094fdb3609 (patch) | |
| tree | b9c335dcae67ff279dc884f2c5cee6df954f01da /contrib | |
| parent | contrib/examples/git-fetch.sh: use the $( ... ) construct for command substit... (diff) | |
| download | tgif-1a3655264ebb238692b3666afe338e094fdb3609.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -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 52f2aafb9d..ee99f1a4ee 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -523,10 +523,10 @@ do if test "$exit" -eq 1 then - cnt=`{ + cnt=$({ git diff-files --name-only git ls-files --unmerged - } | wc -l` + } | wc -l) if test $best_cnt -le 0 || test $cnt -le $best_cnt then best_strategy=$strategy |