Merge branch 'ep/shell-command-substitution-style'
A shell script style update to change `command substitution` into $(command substitution). Coverts contrib/ and much of the t/ directory contents. * ep/shell-command-substitution-style: (92 commits) t9901-git-web--browse.sh: use the $( ... ) construct for command substitution t9501-gitweb-standalone-http-status.sh: use the $( ... ) construct for command substitution t9350-fast-export.sh: use the $( ... ) construct for command substitution t9300-fast-import.sh: use the $( ... ) construct for command substitution t9150-svk-mergetickets.sh: use the $( ... ) construct for command substitution t9145-git-svn-master-branch.sh: use the $( ... ) construct for command substitution t9138-git-svn-authors-prog.sh: use the $( ... ) construct for command substitution t9137-git-svn-dcommit-clobber-series.sh: use the $( ... ) construct for command substitution t9132-git-svn-broken-symlink.sh: use the $( ... ) construct for command substitution t9130-git-svn-authors-file.sh: use the $( ... ) construct for command substitution t9129-git-svn-i18n-commitencoding.sh: use the $( ... ) construct for command substitution t9119-git-svn-info.sh: use the $( ... ) construct for command substitution t9118-git-svn-funky-branch-names.sh: use the $( ... ) construct for command substitution t9114-git-svn-dcommit-merge.sh: use the $( ... ) construct for command substitution t9110-git-svn-use-svm-props.sh: use the $( ... ) construct for command substitution t9109-git-svn-multi-glob.sh: use the $( ... ) construct for command substitution t9108-git-svn-glob.sh: use the $( ... ) construct for command substitution t9107-git-svn-migrate.sh: use the $( ... ) construct for command substitution t9105-git-svn-commit-diff.sh: use the $( ... ) construct for command substitution t9104-git-svn-follow-parent.sh: use the $( ... ) construct for command substitution ...
This commit is contained in:
@ -574,10 +574,10 @@ then
|
||||
if test "$templatefile" != ""
|
||||
then
|
||||
# Test whether this is just the unaltered template.
|
||||
if cnt=`sed -e '/^#/d' < "$templatefile" |
|
||||
if cnt=$(sed -e '/^#/d' < "$templatefile" |
|
||||
git stripspace |
|
||||
diff "$GIT_DIR"/COMMIT_BAREMSG - |
|
||||
wc -l` &&
|
||||
wc -l) &&
|
||||
test 0 -lt $cnt
|
||||
then
|
||||
have_commitmsg=t
|
||||
@ -630,8 +630,8 @@ then
|
||||
fi
|
||||
if test -z "$quiet"
|
||||
then
|
||||
commit=`git diff-tree --always --shortstat --pretty="format:%h: %s"\
|
||||
--abbrev --summary --root HEAD --`
|
||||
commit=$(git diff-tree --always --shortstat --pretty="format:%h: %s"\
|
||||
--abbrev --summary --root HEAD --)
|
||||
echo "Created${initial_commit:+ initial} commit $commit"
|
||||
fi
|
||||
fi
|
||||
|
@ -146,13 +146,13 @@ esac
|
||||
reflist=$(get_remote_refs_for_fetch "$@")
|
||||
if test "$tags"
|
||||
then
|
||||
taglist=`IFS=' ' &&
|
||||
taglist=$(IFS=' ' &&
|
||||
echo "$ls_remote_result" |
|
||||
git show-ref --exclude-existing=refs/tags/ |
|
||||
while read sha1 name
|
||||
do
|
||||
echo ".${name}:${name}"
|
||||
done` || exit
|
||||
done) || exit
|
||||
if test "$#" -gt 1
|
||||
then
|
||||
# remote URL plus explicit refspecs; we need to merge them.
|
||||
|
@ -523,10 +523,10 @@ do
|
||||
|
||||
if test "$exit" -eq 1
|
||||
then
|
||||
cnt=`{
|
||||
cnt=$({
|
||||
git diff-files --name-only
|
||||
git ls-files --unmerged
|
||||
} | wc -l`
|
||||
} | wc -l)
|
||||
if test $best_cnt -le 0 || test $cnt -le $best_cnt
|
||||
then
|
||||
best_strategy=$strategy
|
||||
|
@ -67,8 +67,8 @@ case ",$all_into_one," in
|
||||
,t,)
|
||||
args= existing=
|
||||
if [ -d "$PACKDIR" ]; then
|
||||
for e in `cd "$PACKDIR" && find . -type f -name '*.pack' \
|
||||
| sed -e 's/^\.\///' -e 's/\.pack$//'`
|
||||
for e in $(cd "$PACKDIR" && find . -type f -name '*.pack' \
|
||||
| sed -e 's/^\.\///' -e 's/\.pack$//')
|
||||
do
|
||||
if [ -e "$PACKDIR/$e.keep" ]; then
|
||||
: keep
|
||||
|
@ -138,8 +138,8 @@ cherry-pick)
|
||||
}'
|
||||
|
||||
logmsg=$(git show -s --pretty=raw --encoding="$encoding" "$commit")
|
||||
set_author_env=`echo "$logmsg" |
|
||||
LANG=C LC_ALL=C sed -ne "$pick_author_script"`
|
||||
set_author_env=$(echo "$logmsg" |
|
||||
LANG=C LC_ALL=C sed -ne "$pick_author_script")
|
||||
eval "$set_author_env"
|
||||
export GIT_AUTHOR_NAME
|
||||
export GIT_AUTHOR_EMAIL
|
||||
@ -160,9 +160,9 @@ cherry-pick)
|
||||
esac >.msg
|
||||
|
||||
eval GITHEAD_$head=HEAD
|
||||
eval GITHEAD_$next='`git show -s \
|
||||
eval GITHEAD_$next='$(git show -s \
|
||||
--pretty=oneline --encoding="$encoding" "$commit" |
|
||||
sed -e "s/^[^ ]* //"`'
|
||||
sed -e "s/^[^ ]* //")'
|
||||
export GITHEAD_$head GITHEAD_$next
|
||||
|
||||
# This three way merge is an interesting one. We are at
|
||||
|
@ -31,8 +31,8 @@ BODY=$(sed -e "1,/${SEP}/d" $1)
|
||||
CMT_MSG=$(sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}")
|
||||
DIFF=$(sed -e '1,/^---$/d' "${PATCH}")
|
||||
|
||||
CCS=`echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \
|
||||
-e 's/^Signed-off-by: \(.*\)/\1,/gp'`
|
||||
CCS=$(echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \
|
||||
-e 's/^Signed-off-by: \(.*\)/\1,/gp')
|
||||
|
||||
echo "$SUBJECT" > $1
|
||||
echo "Cc: $CCS" >> $1
|
||||
|
Reference in New Issue
Block a user