mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-am.sh: use the $(...) construct for command substitution

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elia Pinto
2014-03-25 10:22:22 -07:00
committed by Junio C Hamano
parent b09d8552bd
commit 75ee3d7078
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
git-am.sh
View File

@ -125,7 +125,7 @@ cannot_fallback () {
} }
fall_back_3way () { fall_back_3way () {
O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` O_OBJECT=$(cd "$GIT_OBJECT_DIRECTORY" && pwd)
rm -fr "$dotest"/patch-merge-* rm -fr "$dotest"/patch-merge-*
mkdir "$dotest/patch-merge-tmp-dir" mkdir "$dotest/patch-merge-tmp-dir"
@ -275,7 +275,7 @@ split_patches () {
then then
clean_abort "$(gettext "Only one StGIT patch series can be applied at once")" clean_abort "$(gettext "Only one StGIT patch series can be applied at once")"
fi fi
series_dir=`dirname "$1"` series_dir=$(dirname "$1")
series_file="$1" series_file="$1"
shift shift
{ {
@ -298,8 +298,8 @@ split_patches () {
this=0 this=0
for stgit in "$@" for stgit in "$@"
do do
this=`expr "$this" + 1` this=$(expr "$this" + 1)
msgnum=`printf "%0${prec}d" $this` msgnum=$(printf "%0${prec}d" $this)
# Perl version of StGIT parse_patch. The first nonemptyline # Perl version of StGIT parse_patch. The first nonemptyline
# not starting with Author, From or Date is the # not starting with Author, From or Date is the
# subject, and the body starts with the next nonempty # subject, and the body starts with the next nonempty
@ -644,26 +644,26 @@ fi
git_apply_opt=$(cat "$dotest/apply-opt") git_apply_opt=$(cat "$dotest/apply-opt")
if test "$(cat "$dotest/sign")" = t if test "$(cat "$dotest/sign")" = t
then then
SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e ' SIGNOFF=$(git var GIT_COMMITTER_IDENT | sed -e '
s/>.*/>/ s/>.*/>/
s/^/Signed-off-by: /' s/^/Signed-off-by: /'
` )
else else
SIGNOFF= SIGNOFF=
fi fi
last=`cat "$dotest/last"` last=$(cat "$dotest/last")
this=`cat "$dotest/next"` this=$(cat "$dotest/next")
if test "$skip" = t if test "$skip" = t
then then
this=`expr "$this" + 1` this=$(expr "$this" + 1)
resume= resume=
fi fi
while test "$this" -le "$last" while test "$this" -le "$last"
do do
msgnum=`printf "%0${prec}d" $this` msgnum=$(printf "%0${prec}d" $this)
next=`expr "$this" + 1` next=$(expr "$this" + 1)
test -f "$dotest/$msgnum" || { test -f "$dotest/$msgnum" || {
resume= resume=
go_next go_next
@ -739,16 +739,16 @@ To restore the original branch and stop patching run \"\$cmdline --abort\"."
'') '')
if test '' != "$SIGNOFF" if test '' != "$SIGNOFF"
then then
LAST_SIGNED_OFF_BY=` LAST_SIGNED_OFF_BY=$(
sed -ne '/^Signed-off-by: /p' \ sed -ne '/^Signed-off-by: /p' \
"$dotest/msg-clean" | "$dotest/msg-clean" |
sed -ne '$p' sed -ne '$p'
` )
ADD_SIGNOFF=` ADD_SIGNOFF=$(
test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
test '' = "$LAST_SIGNED_OFF_BY" && echo test '' = "$LAST_SIGNED_OFF_BY" && echo
echo "$SIGNOFF" echo "$SIGNOFF"
}` })
else else
ADD_SIGNOFF= ADD_SIGNOFF=
fi fi