mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-21 08:08:16 +02:00
Code

Merge branch 'ep/shell-command-substitution'

Browse Source 
* ep/shell-command-substitution:
  git-am.sh: use the $(...) construct for command substitution
  check-builtins.sh: use the $(...) construct for command substitution
This commit is contained in:
Junio C Hamano 2014-04-03 12:38:04 -07:00
commit 2b06c1e57e
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
check-builtins.sh
View File

@ -14,8 +14,8 @@ sort |
bad=0 bad=0
while read builtin while read builtin
do do
base=`expr "$builtin" : 'git-\(.*\)'` base=$(expr "$builtin" : 'git-\(.*\)')
x=`sed -ne 's/.*{ "'$base'", \(cmd_[^, ]*\).*/'$base' \1/p' git.c` x=$(sed -ne 's/.*{ "'$base'", \(cmd_[^, ]*\).*/'$base' \1/p' git.c)
if test -z "$x" if test -z "$x"
then then
echo "$base is builtin but not listed in git.c command list" echo "$base is builtin but not listed in git.c command list"

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