diff options
| author |  Elia Pinto <gitter.spiros@gmail.com> | 2014-04-16 10:29:54 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-04-17 11:15:00 -0700 |
| commit | 6aeb30eb9fb59f97dd59cc0b580f95a0b98bbe48 (patch) | |
| tree | 54674e31f10cf0d8385f0f5326ecf086706899ca | |
| parent | git-repack.sh: use the $( ... ) construct for command substitution (diff) | |
| download | tgif-6aeb30eb9fb59f97dd59cc0b580f95a0b98bbe48.tar.xz | |
git-resolve.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
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>
| -rwxr-xr-x | contrib/examples/git-resolve.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh index 8f98142f77..48d0fc971f 100755 --- a/contrib/examples/git-resolve.sh +++ b/contrib/examples/git-resolve.sh @@ -75,7 +75,7 @@ case "$common" in GIT_INDEX_FILE=$G git read-tree -m $c $head $merge \ 2>/dev/null || continue # Count the paths that are unmerged. - cnt=`GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l` + cnt=$(GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l) if test $best_cnt -le 0 -o $cnt -le $best_cnt then best=$c |