summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorElia Pinto <gitter.spiros@gmail.com>2015-12-22 14:10:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-27 23:33:13 (GMT)
commit1a3655264ebb238692b3666afe338e094fdb3609 (patch)
treeb9c335dcae67ff279dc884f2c5cee6df954f01da /contrib/examples/git-merge.sh
parentcc301d7e5193801208588cbd54cf1af91b6f7a00 (diff)
downloadgit-1a3655264ebb238692b3666afe338e094fdb3609.zip
git-1a3655264ebb238692b3666afe338e094fdb3609.tar.gz
git-1a3655264ebb238692b3666afe338e094fdb3609.tar.bz2
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/examples/git-merge.sh')
-rwxr-xr-xcontrib/examples/git-merge.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index 52f2aaf..ee99f1a 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