Skip to content

Commit 6aeb30e

Browse files
devzero2000gitster
authored andcommitted
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 <[email protected]> Reviewed-by: Matthieu Moy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ddbac79 commit 6aeb30e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contrib/examples/git-resolve.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ case "$common" in
7575
GIT_INDEX_FILE=$G git read-tree -m $c $head $merge \
7676
2>/dev/null || continue
7777
# 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)
7979
if test $best_cnt -le 0 -o $cnt -le $best_cnt
8080
then
8181
best=$c

0 commit comments

Comments
 (0)