git-commit.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>
This commit is contained in:
parent
add77e8400
commit
346b54dbc9
@ -91,7 +91,7 @@ signoff=
|
|||||||
force_author=
|
force_author=
|
||||||
only_include_assumed=
|
only_include_assumed=
|
||||||
untracked_files=
|
untracked_files=
|
||||||
templatefile="`git config commit.template`"
|
templatefile="$(git config commit.template)"
|
||||||
while test $# != 0
|
while test $# != 0
|
||||||
do
|
do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
@ -350,7 +350,7 @@ t,)
|
|||||||
TMP_INDEX="$GIT_DIR/tmp-index$$"
|
TMP_INDEX="$GIT_DIR/tmp-index$$"
|
||||||
W=
|
W=
|
||||||
test -z "$initial_commit" && W=--with-tree=HEAD
|
test -z "$initial_commit" && W=--with-tree=HEAD
|
||||||
commit_only=`git ls-files --error-unmatch $W -- "$@"` || exit
|
commit_only=$(git ls-files --error-unmatch $W -- "$@") || exit
|
||||||
|
|
||||||
# Build a temporary index and update the real index
|
# Build a temporary index and update the real index
|
||||||
# the same way.
|
# the same way.
|
||||||
@ -475,8 +475,8 @@ then
|
|||||||
fi
|
fi
|
||||||
if test '' != "$force_author"
|
if test '' != "$force_author"
|
||||||
then
|
then
|
||||||
GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
|
GIT_AUTHOR_NAME=$(expr "z$force_author" : 'z\(.*[^ ]\) *<.*') &&
|
||||||
GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
|
GIT_AUTHOR_EMAIL=$(expr "z$force_author" : '.*\(<.*\)') &&
|
||||||
test '' != "$GIT_AUTHOR_NAME" &&
|
test '' != "$GIT_AUTHOR_NAME" &&
|
||||||
test '' != "$GIT_AUTHOR_EMAIL" ||
|
test '' != "$GIT_AUTHOR_EMAIL" ||
|
||||||
die "malformed --author parameter"
|
die "malformed --author parameter"
|
||||||
@ -489,7 +489,7 @@ then
|
|||||||
rloga='commit'
|
rloga='commit'
|
||||||
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
|
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
|
||||||
rloga='commit (merge)'
|
rloga='commit (merge)'
|
||||||
PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
|
PARENTS="-p HEAD "$(sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD")
|
||||||
elif test -n "$amend"; then
|
elif test -n "$amend"; then
|
||||||
rloga='commit (amend)'
|
rloga='commit (amend)'
|
||||||
PARENTS=$(git cat-file commit HEAD |
|
PARENTS=$(git cat-file commit HEAD |
|
||||||
|
Loading…
Reference in New Issue
Block a user