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>
Elia Pinto committed
Apr 16, 2014 at 10:29 UTC
6aeb30eb9fb59f97dd59cc0b580f95a0b98bbe48
1 file changed
+1
-1
contrib/examples/git-resolve.sh
+1
-1
@@ -75,7 +75,7 @@ case "$common" in
75
GIT_INDEX_FILE=$G git read-tree -m $c $head $merge \
76
2>/dev/null || continue
77
# Count the paths that are unmerged.
78
- cnt=`GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l`
78
+ cnt=$(GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l)
79
if test $best_cnt -le 0 -o $cnt -le $best_cnt
80
then
81
best=$c