development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ep/shell-command-substitution'

Browse source 
Adjust shell scripts to use $(cmd) instead of `cmd`.

* ep/shell-command-substitution: (41 commits)
  t5000-tar-tree.sh: use the $( ... ) construct for command substitution
  t4204-patch-id.sh: use the $( ... ) construct for command substitution
  t4119-apply-config.sh: use the $( ... ) construct for command substitution
  t4116-apply-reverse.sh: use the $( ... ) construct for command substitution
  t4057-diff-combined-paths.sh: use the $( ... ) construct for command substitution
  t4038-diff-combined.sh: use the $( ... ) construct for command substitution
  t4036-format-patch-signer-mime.sh: use the $( ... ) construct for command substitution
  t4014-format-patch.sh: use the $( ... ) construct for command substitution
  t4013-diff-various.sh: use the $( ... ) construct for command substitution
  t4012-diff-binary.sh: use the $( ... ) construct for command substitution
  t4010-diff-pathspec.sh: use the $( ... ) construct for command substitution
  t4006-diff-mode.sh: use the $( ... ) construct for command substitution
  t3910-mac-os-precompose.sh: use the $( ... ) construct for command substitution
  t3905-stash-include-untracked.sh: use the $( ... ) construct for command substitution
  t1050-large.sh: use the $( ... ) construct for command substitution
  t1020-subdirectory.sh: use the $( ... ) construct for command substitution
  t1004-read-tree-m-u-wf.sh: use the $( ... ) construct for command substitution
  t1003-read-tree-prefix.sh: use the $( ... ) construct for command substitution
  t1002-read-tree-m-u-2way.sh: use the $( ... ) construct for command substitution
  t1001-read-tree-m-2way.sh: use the $( ... ) construct for command substitution
  ...
This commit is contained in:
Junio C Hamano 2014-06-03 12:06:45 -07:00
parent 6d3c4e93d4 f5efd5196c
commit 6753d8a85d
41 changed files with 174 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/mw-to-git/t/t9365-continuing-queries.sh
View file

@ -9,7 +9,7 @@ test_check_precond
test_expect_success 'creating page w/ >500 revisions' ' test_expect_success 'creating page w/ >500 revisions' '
wiki_reset && wiki_reset &&
for i in `test_seq 501` for i in $(test_seq 501)
do do
echo "creating revision $i" && echo "creating revision $i" &&
wiki_editpage foo "revision $i<br/>" true wiki_editpage foo "revision $i<br/>" true

6
contrib/mw-to-git/t/test-gitmw-lib.sh
View file

@ -90,7 +90,7 @@ test_diff_directories () {
# #
# Check that <dir> contains exactly <N> files # Check that <dir> contains exactly <N> files
test_contains_N_files () { test_contains_N_files () {
if test `ls -- "$1" | wc -l` -ne "$2"; then if test $(ls -- "$1" | wc -l) -ne "$2"; then
echo "directory $1 should contain $2 files" echo "directory $1 should contain $2 files"
echo "it contains these files:" echo "it contains these files:"
ls "$1" ls "$1"
@ -340,10 +340,10 @@ wiki_install () {
"http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\ "http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\
"$MW_FILENAME. "\ "$MW_FILENAME. "\
"Please fix your connection and launch the script again." "Please fix your connection and launch the script again."
echo "$MW_FILENAME downloaded in `pwd`. "\ echo "$MW_FILENAME downloaded in $(pwd). "\
"You can delete it later if you want." "You can delete it later if you want."
else else
echo "Reusing existing $MW_FILENAME downloaded in `pwd`." echo "Reusing existing $MW_FILENAME downloaded in $(pwd)."
fi fi
archive_abs_path=$(pwd)/$MW_FILENAME archive_abs_path=$(pwd)/$MW_FILENAME
cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" || cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||

2
contrib/subtree/t/t7900-subtree.sh
View file

@ -76,7 +76,7 @@ test_expect_success 'add sub1' '
# Save this hash for testing later. # Save this hash for testing later.
subdir_hash=`git rev-parse HEAD` subdir_hash=$(git rev-parse HEAD)
test_expect_success 'add sub2' ' test_expect_success 'add sub2' '
create sub2 && create sub2 &&

14
contrib/thunderbird-patch-inline/appp.sh
View file

@ -10,7 +10,7 @@ CONFFILE=~/.appprc
SEP="-=-=-=-=-=-=-=-=-=# Don't remove this line #=-=-=-=-=-=-=-=-=-" SEP="-=-=-=-=-=-=-=-=-=# Don't remove this line #=-=-=-=-=-=-=-=-=-"
if [ -e "$CONFFILE" ] ; then if [ -e "$CONFFILE" ] ; then
LAST_DIR=`grep -m 1 "^LAST_DIR=" "${CONFFILE}"|sed -e 's/^LAST_DIR=//'` LAST_DIR=$(grep -m 1 "^LAST_DIR=" "${CONFFILE}"|sed -e 's/^LAST_DIR=//')
cd "${LAST_DIR}" cd "${LAST_DIR}"
else else
cd > /dev/null cd > /dev/null
@ -25,11 +25,11 @@ fi
cd - > /dev/null cd - > /dev/null
SUBJECT=`sed -n -e '/^Subject: /p' "${PATCH}"` SUBJECT=$(sed -n -e '/^Subject: /p' "${PATCH}")
HEADERS=`sed -e '/^'"${SEP}"'$/,$d' $1` HEADERS=$(sed -e '/^'"${SEP}"'$/,$d' $1)
BODY=`sed -e "1,/${SEP}/d" $1` BODY=$(sed -e "1,/${SEP}/d" $1)
CMT_MSG=`sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}"` CMT_MSG=$(sed -e '1,/^$/d' -e '/^---$/,$d' "${PATCH}")
DIFF=`sed -e '1,/^---$/d' "${PATCH}"` DIFF=$(sed -e '1,/^---$/d' "${PATCH}")
CCS=`echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \ CCS=`echo -e "$CMT_MSG\n$HEADERS" | sed -n -e 's/^Cc: \(.*\)$/\1,/gp' \
-e 's/^Signed-off-by: \(.*\)/\1,/gp'` -e 's/^Signed-off-by: \(.*\)/\1,/gp'`
@ -48,7 +48,7 @@ if [ "x${BODY}x" != "xx" ] ; then
fi fi
echo "$DIFF" >> $1 echo "$DIFF" >> $1
LAST_DIR=`dirname "${PATCH}"` LAST_DIR=$(dirname "${PATCH}")
grep -v "^LAST_DIR=" "${CONFFILE}" > "${CONFFILE}_" grep -v "^LAST_DIR=" "${CONFFILE}" > "${CONFFILE}_"
echo "LAST_DIR=${LAST_DIR}" >> "${CONFFILE}_" echo "LAST_DIR=${LAST_DIR}" >> "${CONFFILE}_"

2
git-pull.sh
View file

@ -108,7 +108,7 @@ do
-s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy)
case "$#,$1" in case "$#,$1" in
*,*=*) *,*=*)
strategy=`expr "z$1" : 'z-[^=]*=\(.*\)'` ;; strategy=$(expr "z$1" : 'z-[^=]*=\(.*\)') ;;
1,*) 1,*)
usage ;; usage ;;
*) *)

4
git-rebase--merge.sh
View file

@ -24,7 +24,7 @@ continue_merge () {
die "$resolvemsg" die "$resolvemsg"
fi fi
cmt=`cat "$state_dir/current"` cmt=$(cat "$state_dir/current")
if ! git diff-index --quiet --ignore-submodules HEAD -- if ! git diff-index --quiet --ignore-submodules HEAD --
then then
if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt" if ! git commit ${gpg_sign_opt:+"$gpg_sign_opt"} --no-verify -C "$cmt"
@ -143,7 +143,7 @@ echo "$onto_name" > "$state_dir/onto_name"
write_basic_state write_basic_state
msgnum=0 msgnum=0
for cmt in `git rev-list --reverse --no-merges "$revisions"` for cmt in $(git rev-list --reverse --no-merges "$revisions")
do do
msgnum=$(($msgnum + 1)) msgnum=$(($msgnum + 1))
echo "$cmt" > "$state_dir/cmt.$msgnum" echo "$cmt" > "$state_dir/cmt.$msgnum"

8
git-rebase.sh
View file

@ -457,8 +457,8 @@ then
else else
if test -z "$onto" if test -z "$onto"
then then
empty_tree=`git hash-object -t tree /dev/null` empty_tree=$(git hash-object -t tree /dev/null)
onto=`git commit-tree $empty_tree </dev/null` onto=$(git commit-tree $empty_tree </dev/null)
squash_onto="$onto" squash_onto="$onto"
fi fi
unset upstream_name unset upstream_name
@ -516,10 +516,10 @@ case "$#" in
;; ;;
0) 0)
# Do not need to switch branches, we are already on it. # Do not need to switch branches, we are already on it.
if branch_name=`git symbolic-ref -q HEAD` if branch_name=$(git symbolic-ref -q HEAD)
then then
head_name=$branch_name head_name=$branch_name
branch_name=`expr "z$branch_name" : 'zrefs/heads/\(.*\)'` branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)')
else else
head_name="detached HEAD" head_name="detached HEAD"
branch_name=HEAD ;# detached branch_name=HEAD ;# detached

2
git-stash.sh
View file

@ -13,7 +13,7 @@ USAGE="list [<options>]
SUBDIRECTORY_OK=Yes SUBDIRECTORY_OK=Yes
OPTIONS_SPEC= OPTIONS_SPEC=
START_DIR=`pwd` START_DIR=$(pwd)
. git-sh-setup . git-sh-setup
. git-sh-i18n . git-sh-i18n
require_work_tree require_work_tree

6
git-web--browse.sh
View file

@ -59,7 +59,7 @@ do
-b|--browser*|-t|--tool*) -b|--browser*|-t|--tool*)
case "$#,$1" in case "$#,$1" in
*,*=*) *,*=*)
browser=`expr "z$1" : 'z-[^=]*=\(.*\)'` browser=$(expr "z$1" : 'z-[^=]*=\(.*\)')
;; ;;
1,*) 1,*)
usage ;; usage ;;
@ -71,7 +71,7 @@ do
-c|--config*) -c|--config*)
case "$#,$1" in case "$#,$1" in
*,*=*) *,*=*)
conf=`expr "z$1" : 'z-[^=]*=\(.*\)'` conf=$(expr "z$1" : 'z-[^=]*=\(.*\)')
;; ;;
1,*) 1,*)
usage ;; usage ;;
@ -100,7 +100,7 @@ then
for opt in "$conf" "web.browser" for opt in "$conf" "web.browser"
do do
test -z "$opt" && continue test -z "$opt" && continue
browser="`git config $opt`" browser="$(git config $opt)"
test -z "$browser" || break test -z "$browser" || break
done done
if test -n "$browser" && ! valid_tool "$browser"; then if test -n "$browser" && ! valid_tool "$browser"; then

2
t/lib-credential.sh
View file

@ -281,7 +281,7 @@ helper_test_timeout() {
cat >askpass <<\EOF cat >askpass <<\EOF
#!/bin/sh #!/bin/sh
echo >&2 askpass: $* echo >&2 askpass: $*
what=`echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z` what=$(echo $1 | cut -d" " -f1 | tr A-Z a-z | tr -cd a-z)
echo "askpass-$what" echo "askpass-$what"
EOF EOF
chmod +x askpass chmod +x askpass

2
t/lib-cvs.sh
View file

@ -13,7 +13,7 @@ fi
CVS="cvs -f" CVS="cvs -f"
export CVS export CVS
cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` cvsps_version=$(cvsps -h 2>&1 | sed -ne 's/cvsps version //p')
case "$cvsps_version" in case "$cvsps_version" in
2.1 | 2.2*) 2.1 | 2.2*)
;; ;;

2
t/lib-gpg.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
gpg_version=`gpg --version 2>&1` gpg_version=$(gpg --version 2>&1)
if test $? = 127; then if test $? = 127; then
say "You do not seem to have gpg installed" say "You do not seem to have gpg installed"
else else

2
t/perf/p5302-pack-index.sh
View file

@ -8,7 +8,7 @@ test_perf_large_repo
test_expect_success 'repack' ' test_expect_success 'repack' '
git repack -ad && git repack -ad &&
PACK=`ls .git/objects/pack/*.pack | head -n1` && PACK=$(ls .git/objects/pack/*.pack | head -n1) &&
test -f "$PACK" && test -f "$PACK" &&
export PACK export PACK
' '

12
t/t0001-init.sh
View file

@ -185,14 +185,14 @@ test_expect_success 'init --bare/--shared overrides system/global config' '
git init --bare --shared=0666 init-bare-shared-override && git init --bare --shared=0666 init-bare-shared-override &&
check_config init-bare-shared-override true unset && check_config init-bare-shared-override true unset &&
test x0666 = \ test x0666 = \
x`git config -f init-bare-shared-override/config core.sharedRepository` x$(git config -f init-bare-shared-override/config core.sharedRepository)
' '
test_expect_success 'init honors global core.sharedRepository' ' test_expect_success 'init honors global core.sharedRepository' '
test_config_global core.sharedRepository 0666 && test_config_global core.sharedRepository 0666 &&
git init shared-honor-global && git init shared-honor-global &&
test x0666 = \ test x0666 = \
x`git config -f shared-honor-global/.git/config core.sharedRepository` x$(git config -f shared-honor-global/.git/config core.sharedRepository)
' '
test_expect_success 'init rejects insanely long --template' ' test_expect_success 'init rejects insanely long --template' '
@ -285,7 +285,7 @@ test_expect_success 'init prefers command line to GIT_DIR' '
test_expect_success 'init with separate gitdir' ' test_expect_success 'init with separate gitdir' '
rm -rf newdir && rm -rf newdir &&
git init --separate-git-dir realgitdir newdir && git init --separate-git-dir realgitdir newdir &&
echo "gitdir: `pwd`/realgitdir" >expected && echo "gitdir: $(pwd)/realgitdir" >expected &&
test_cmp expected newdir/.git && test_cmp expected newdir/.git &&
test_path_is_dir realgitdir/refs test_path_is_dir realgitdir/refs
' '
@ -299,7 +299,7 @@ test_expect_success 're-init to update git link' '
cd newdir && cd newdir &&
git init --separate-git-dir ../surrealgitdir git init --separate-git-dir ../surrealgitdir
) && ) &&
echo "gitdir: `pwd`/surrealgitdir" >expected && echo "gitdir: $(pwd)/surrealgitdir" >expected &&
test_cmp expected newdir/.git && test_cmp expected newdir/.git &&
test_path_is_dir surrealgitdir/refs && test_path_is_dir surrealgitdir/refs &&
test_path_is_missing realgitdir/refs test_path_is_missing realgitdir/refs
@ -312,7 +312,7 @@ test_expect_success 're-init to move gitdir' '
cd newdir && cd newdir &&
git init --separate-git-dir ../realgitdir git init --separate-git-dir ../realgitdir
) && ) &&
echo "gitdir: `pwd`/realgitdir" >expected && echo "gitdir: $(pwd)/realgitdir" >expected &&
test_cmp expected newdir/.git && test_cmp expected newdir/.git &&
test_path_is_dir realgitdir/refs test_path_is_dir realgitdir/refs
' '
@ -326,7 +326,7 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
ln -s here .git && ln -s here .git &&
git init --separate-git-dir ../realgitdir git init --separate-git-dir ../realgitdir
) && ) &&
echo "gitdir: `pwd`/realgitdir" >expected && echo "gitdir: $(pwd)/realgitdir" >expected &&
test_cmp expected newdir/.git && test_cmp expected newdir/.git &&
test_cmp expected newdir/here && test_cmp expected newdir/here &&
test_path_is_dir realgitdir/refs test_path_is_dir realgitdir/refs

4
t/t0010-racy-git.sh
View file

@ -14,7 +14,7 @@ do
git update-index --add infocom git update-index --add infocom
echo xyzzy >infocom echo xyzzy >infocom
files=`git diff-files -p` files=$(git diff-files -p)
test_expect_success \ test_expect_success \
"Racy GIT trial #$trial part A" \ "Racy GIT trial #$trial part A" \
'test "" != "$files"' 'test "" != "$files"'
@ -23,7 +23,7 @@ do
echo xyzzy >cornerstone echo xyzzy >cornerstone
git update-index --add cornerstone git update-index --add cornerstone
files=`git diff-files -p` files=$(git diff-files -p)
test_expect_success \ test_expect_success \
"Racy GIT trial #$trial part B" \ "Racy GIT trial #$trial part B" \
'test "" != "$files"' 'test "" != "$files"'

42
t/t0020-crlf.sh
View file

@ -20,14 +20,14 @@ test_expect_success setup '
git commit -m initial && git commit -m initial &&
one=`git rev-parse HEAD:one` && one=$(git rev-parse HEAD:one) &&
dir=`git rev-parse HEAD:dir` && dir=$(git rev-parse HEAD:dir) &&
two=`git rev-parse HEAD:dir/two` && two=$(git rev-parse HEAD:dir/two) &&
three=`git rev-parse HEAD:three` && three=$(git rev-parse HEAD:three) &&
for w in Some extra lines here; do echo $w; done >>one && for w in Some extra lines here; do echo $w; done >>one &&
git diff >patch.file && git diff >patch.file &&
patched=`git hash-object --stdin <one` && patched=$(git hash-object --stdin <one) &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
echo happy. echo happy.
@ -111,7 +111,7 @@ test_expect_success 'update with autocrlf=input' '
} }
done && done &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -135,7 +135,7 @@ test_expect_success 'update with autocrlf=true' '
} }
done && done &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -158,9 +158,9 @@ test_expect_success 'checkout with autocrlf=true' '
break break
} }
done && done &&
test "$one" = `git hash-object --stdin <one` && test "$one" = $(git hash-object --stdin <one) &&
test "$two" = `git hash-object --stdin <dir/two` && test "$two" = $(git hash-object --stdin <dir/two) &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -184,9 +184,9 @@ test_expect_success 'checkout with autocrlf=input' '
git update-index -- $f git update-index -- $f
fi fi
done && done &&
test "$one" = `git hash-object --stdin <one` && test "$one" = $(git hash-object --stdin <one) &&
test "$two" = `git hash-object --stdin <dir/two` && test "$two" = $(git hash-object --stdin <dir/two) &&
differs=`git diff-index --cached HEAD` && differs=$(git diff-index --cached HEAD) &&
test -z "$differs" || { test -z "$differs" || {
echo Oops "$differs" echo Oops "$differs"
false false
@ -200,7 +200,7 @@ test_expect_success 'apply patch (autocrlf=input)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply patch.file && git apply patch.file &&
test "$patched" = "`git hash-object --stdin <one`" || { test "$patched" = "$(git hash-object --stdin <one)" || {
echo "Eh? apply without index" echo "Eh? apply without index"
false false
} }
@ -213,7 +213,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --cached patch.file && git apply --cached patch.file &&
test "$patched" = `git rev-parse :one` || { test "$patched" = $(git rev-parse :one) || {
echo "Eh? apply with --cached" echo "Eh? apply with --cached"
false false
} }
@ -226,8 +226,8 @@ test_expect_success 'apply patch --index (autocrlf=input)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --index patch.file && git apply --index patch.file &&
test "$patched" = `git rev-parse :one` && test "$patched" = $(git rev-parse :one) &&
test "$patched" = `git hash-object --stdin <one` || { test "$patched" = $(git hash-object --stdin <one) || {
echo "Eh? apply with --index" echo "Eh? apply with --index"
false false
} }
@ -240,7 +240,7 @@ test_expect_success 'apply patch (autocrlf=true)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply patch.file && git apply patch.file &&
test "$patched" = "`remove_cr <one | git hash-object --stdin`" || { test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || {
echo "Eh? apply without index" echo "Eh? apply without index"
false false
} }
@ -253,7 +253,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --cached patch.file && git apply --cached patch.file &&
test "$patched" = `git rev-parse :one` || { test "$patched" = $(git rev-parse :one) || {
echo "Eh? apply without index" echo "Eh? apply without index"
false false
} }
@ -266,8 +266,8 @@ test_expect_success 'apply patch --index (autocrlf=true)' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
git apply --index patch.file && git apply --index patch.file &&
test "$patched" = `git rev-parse :one` && test "$patched" = $(git rev-parse :one) &&
test "$patched" = "`remove_cr <one | git hash-object --stdin`" || { test "$patched" = "$(remove_cr <one | git hash-object --stdin)" || {
echo "Eh? apply with --index" echo "Eh? apply with --index"
false false
} }

38
t/t0025-crlf-auto.sh
View file

@ -19,9 +19,9 @@ test_expect_success setup '
git commit -m initial && git commit -m initial &&
one=`git rev-parse HEAD:one` && one=$(git rev-parse HEAD:one) &&
two=`git rev-parse HEAD:two` && two=$(git rev-parse HEAD:two) &&
three=`git rev-parse HEAD:three` && three=$(git rev-parse HEAD:three) &&
echo happy. echo happy.
' '
@ -33,9 +33,9 @@ test_expect_success 'default settings cause no changes' '
! has_cr one && ! has_cr one &&
has_cr two && has_cr two &&
onediff=`git diff one` && onediff=$(git diff one) &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
threediff=`git diff three` && threediff=$(git diff three) &&
test -z "$onediff" -a -z "$twodiff" -a -z "$threediff" test -z "$onediff" -a -z "$twodiff" -a -z "$threediff"
' '
@ -48,7 +48,7 @@ test_expect_success 'crlf=true causes a CRLF file to be normalized' '
# Note, "normalized" means that git will normalize it if added # Note, "normalized" means that git will normalize it if added
has_cr two && has_cr two &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
test -n "$twodiff" test -n "$twodiff"
' '
@ -60,7 +60,7 @@ test_expect_success 'text=true causes a CRLF file to be normalized' '
# Note, "normalized" means that git will normalize it if added # Note, "normalized" means that git will normalize it if added
has_cr two && has_cr two &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
test -n "$twodiff" test -n "$twodiff"
' '
@ -72,7 +72,7 @@ test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=false'
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr one && has_cr one &&
onediff=`git diff one` && onediff=$(git diff one) &&
test -z "$onediff" test -z "$onediff"
' '
@ -84,7 +84,7 @@ test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=input'
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr one && has_cr one &&
onediff=`git diff one` && onediff=$(git diff one) &&
test -z "$onediff" test -z "$onediff"
' '
@ -96,7 +96,7 @@ test_expect_success 'eol=lf gives a normalized file LFs with autocrlf=true' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
! has_cr one && ! has_cr one &&
onediff=`git diff one` && onediff=$(git diff one) &&
test -z "$onediff" test -z "$onediff"
' '
@ -108,9 +108,9 @@ test_expect_success 'autocrlf=true does not normalize CRLF files' '
has_cr one && has_cr one &&
has_cr two && has_cr two &&
onediff=`git diff one` && onediff=$(git diff one) &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
threediff=`git diff three` && threediff=$(git diff three) &&
test -z "$onediff" -a -z "$twodiff" -a -z "$threediff" test -z "$onediff" -a -z "$twodiff" -a -z "$threediff"
' '
@ -123,9 +123,9 @@ test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' '
has_cr one && has_cr one &&
has_cr two && has_cr two &&
onediff=`git diff one` && onediff=$(git diff one) &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
threediff=`git diff three` && threediff=$(git diff three) &&
test -z "$onediff" -a -n "$twodiff" -a -z "$threediff" test -z "$onediff" -a -n "$twodiff" -a -z "$threediff"
' '
@ -137,7 +137,7 @@ test_expect_success 'text=auto, autocrlf=true does not normalize binary files' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
! has_cr three && ! has_cr three &&
threediff=`git diff three` && threediff=$(git diff three) &&
test -z "$threediff" test -z "$threediff"
' '
@ -148,7 +148,7 @@ test_expect_success 'eol=crlf _does_ normalize binary files' '
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr three && has_cr three &&
threediff=`git diff three` && threediff=$(git diff three) &&
test -z "$threediff" test -z "$threediff"
' '

20
t/t0026-eol-config.sh
View file

@ -20,8 +20,8 @@ test_expect_success setup '
git commit -m initial && git commit -m initial &&
one=`git rev-parse HEAD:one` && one=$(git rev-parse HEAD:one) &&
two=`git rev-parse HEAD:two` && two=$(git rev-parse HEAD:two) &&
echo happy. echo happy.
' '
@ -34,8 +34,8 @@ test_expect_success 'eol=lf puts LFs in normalized file' '
! has_cr one && ! has_cr one &&
! has_cr two && ! has_cr two &&
onediff=`git diff one` && onediff=$(git diff one) &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
test -z "$onediff" -a -z "$twodiff" test -z "$onediff" -a -z "$twodiff"
' '
@ -47,8 +47,8 @@ test_expect_success 'eol=crlf puts CRLFs in normalized file' '
has_cr one && has_cr one &&
! has_cr two && ! has_cr two &&
onediff=`git diff one` && onediff=$(git diff one) &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
test -z "$onediff" -a -z "$twodiff" test -z "$onediff" -a -z "$twodiff"
' '
@ -61,8 +61,8 @@ test_expect_success 'autocrlf=true overrides eol=lf' '
has_cr one && has_cr one &&
has_cr two && has_cr two &&
onediff=`git diff one` && onediff=$(git diff one) &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
test -z "$onediff" -a -z "$twodiff" test -z "$onediff" -a -z "$twodiff"
' '
@ -75,8 +75,8 @@ test_expect_success 'autocrlf=true overrides unset eol' '
has_cr one && has_cr one &&
has_cr two && has_cr two &&
onediff=`git diff one` && onediff=$(git diff one) &&
twodiff=`git diff two` && twodiff=$(git diff two) &&
test -z "$onediff" -a -z "$twodiff" test -z "$onediff" -a -z "$twodiff"
' '

20
t/t0030-stripspace.sh
View file

@ -225,22 +225,22 @@ test_expect_success \
test_expect_success \ test_expect_success \
'text without newline at end should end with newline' ' 'text without newline at end should end with newline' '
test `printf "$ttt" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$ttt" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt$ttt" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$ttt$ttt" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt$ttt$ttt" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$ttt$ttt$ttt" | git stripspace | wc -l` -gt 0 test $(printf "$ttt$ttt$ttt$ttt" | git stripspace | wc -l) -gt 0
' '
# text plus spaces at the end: # text plus spaces at the end:
test_expect_success \ test_expect_success \
'text plus spaces without newline at end should end with newline' ' 'text plus spaces without newline at end should end with newline' '
test `printf "$ttt$sss" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt$sss" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt$ttt$sss" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$sss$sss" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt$sss$sss" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$ttt$sss$sss" | git stripspace | wc -l` -gt 0 && test $(printf "$ttt$ttt$sss$sss" | git stripspace | wc -l) -gt 0 &&
test `printf "$ttt$sss$sss$sss" | git stripspace | wc -l` -gt 0 test $(printf "$ttt$sss$sss$sss" | git stripspace | wc -l) -gt 0
' '
test_expect_success \ test_expect_success \

2
t/t0300-credentials.sh
View file

@ -6,7 +6,7 @@ test_description='basic credential helper tests'
test_expect_success 'setup helper scripts' ' test_expect_success 'setup helper scripts' '
cat >dump <<-\EOF && cat >dump <<-\EOF &&
whoami=`echo $0 | sed s/.*git-credential-//` whoami=$(echo $0 | sed s/.*git-credential-//)
echo >&2 "$whoami: $*" echo >&2 "$whoami: $*"
OIFS=$IFS OIFS=$IFS
IFS== IFS==

4
t/t1000-read-tree-m-3way.sh
View file

@ -519,10 +519,10 @@ test_expect_success \
'rm -f .git/index F16 && 'rm -f .git/index F16 &&
echo F16 >F16 && echo F16 >F16 &&
git update-index --add F16 && git update-index --add F16 &&
tree0=`git write-tree` && tree0=$(git write-tree) &&
echo E16 >F16 && echo E16 >F16 &&
git update-index F16 && git update-index F16 &&
tree1=`git write-tree` && tree1=$(git write-tree) &&
read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 && read_tree_must_succeed -m $tree0 $tree1 $tree1 $tree0 &&
git ls-files --stage' git ls-files --stage'

18
t/t1001-read-tree-m-2way.sh
View file

@ -36,7 +36,7 @@ compare_change () {
} }
check_cache_at () { check_cache_at () {
clean_if_empty=`git diff-files -- "$1"` clean_if_empty=$(git diff-files -- "$1")
case "$clean_if_empty" in case "$clean_if_empty" in
'') echo "$1: clean" ;; '') echo "$1: clean" ;;
?*) echo "$1: dirty" ;; ?*) echo "$1: dirty" ;;
@ -68,14 +68,14 @@ test_expect_success \
echo rezrov >rezrov && echo rezrov >rezrov &&
echo yomin >yomin && echo yomin >yomin &&
git update-index --add nitfol bozbar rezrov && git update-index --add nitfol bozbar rezrov &&
treeH=`git write-tree` && treeH=$(git write-tree) &&
echo treeH $treeH && echo treeH $treeH &&
git ls-tree $treeH && git ls-tree $treeH &&
cat bozbar-new >bozbar && cat bozbar-new >bozbar &&
git update-index --add frotz bozbar --force-remove rezrov && git update-index --add frotz bozbar --force-remove rezrov &&
git ls-files --stage >M.out && git ls-files --stage >M.out &&
treeM=`git write-tree` && treeM=$(git write-tree) &&
echo treeM $treeM && echo treeM $treeM &&
git ls-tree $treeM && git ls-tree $treeM &&
git diff-tree $treeH $treeM' git diff-tree $treeH $treeM'
@ -315,7 +315,7 @@ test_expect_success \
'rm -f .git/index && 'rm -f .git/index &&
echo DF >DF && echo DF >DF &&
git update-index --add DF && git update-index --add DF &&
treeDF=`git write-tree` && treeDF=$(git write-tree) &&
echo treeDF $treeDF && echo treeDF $treeDF &&
git ls-tree $treeDF && git ls-tree $treeDF &&
@ -323,7 +323,7 @@ test_expect_success \
mkdir DF && mkdir DF &&
echo DF/DF >DF/DF && echo DF/DF >DF/DF &&
git update-index --add --remove DF DF/DF && git update-index --add --remove DF DF/DF &&
treeDFDF=`git write-tree` && treeDFDF=$(git write-tree) &&
echo treeDFDF $treeDFDF && echo treeDFDF $treeDFDF &&
git ls-tree $treeDFDF && git ls-tree $treeDFDF &&
git ls-files --stage >DFDF.out' git ls-files --stage >DFDF.out'
@ -345,7 +345,7 @@ test_expect_success \
'rm -f .git/index && 'rm -f .git/index &&
: >a && : >a &&
git update-index --add a && git update-index --add a &&
treeM=`git write-tree` && treeM=$(git write-tree) &&
echo treeM $treeM && echo treeM $treeM &&
git ls-tree $treeM && git ls-tree $treeM &&
git ls-files --stage >treeM.out && git ls-files --stage >treeM.out &&
@ -354,7 +354,7 @@ test_expect_success \
git update-index --remove a && git update-index --remove a &&
mkdir a && mkdir a &&
: >a/b && : >a/b &&
treeH=`git write-tree` && treeH=$(git write-tree) &&
echo treeH $treeH && echo treeH $treeH &&
git ls-tree $treeH' git ls-tree $treeH'
@ -372,7 +372,7 @@ test_expect_success \
mkdir c && mkdir c &&
: >c/d && : >c/d &&
git update-index --add a c/d && git update-index --add a c/d &&
treeM=`git write-tree` && treeM=$(git write-tree) &&
echo treeM $treeM && echo treeM $treeM &&
git ls-tree $treeM && git ls-tree $treeM &&
git ls-files --stage >treeM.out && git ls-files --stage >treeM.out &&
@ -381,7 +381,7 @@ test_expect_success \
mkdir a && mkdir a &&
: >a/b && : >a/b &&
git update-index --add --remove a a/b && git update-index --add --remove a a/b &&
treeH=`git write-tree` && treeH=$(git write-tree) &&
echo treeH $treeH && echo treeH $treeH &&
git ls-tree $treeH' git ls-tree $treeH'

10
t/t1002-read-tree-m-u-2way.sh
View file

@ -21,7 +21,7 @@ compare_change () {
} }
check_cache_at () { check_cache_at () {
clean_if_empty=`git diff-files -- "$1"` clean_if_empty=$(git diff-files -- "$1")
case "$clean_if_empty" in case "$clean_if_empty" in
'') echo "$1: clean" ;; '') echo "$1: clean" ;;
?*) echo "$1: dirty" ;; ?*) echo "$1: dirty" ;;
@ -41,14 +41,14 @@ test_expect_success \
echo bozbar >bozbar && echo bozbar >bozbar &&
echo rezrov >rezrov && echo rezrov >rezrov &&
git update-index --add nitfol bozbar rezrov && git update-index --add nitfol bozbar rezrov &&
treeH=`git write-tree` && treeH=$(git write-tree) &&
echo treeH $treeH && echo treeH $treeH &&
git ls-tree $treeH && git ls-tree $treeH &&
echo gnusto >bozbar && echo gnusto >bozbar &&
git update-index --add frotz bozbar --force-remove rezrov && git update-index --add frotz bozbar --force-remove rezrov &&
git ls-files --stage >M.out && git ls-files --stage >M.out &&
treeM=`git write-tree` && treeM=$(git write-tree) &&
echo treeM $treeM && echo treeM $treeM &&
git ls-tree $treeM && git ls-tree $treeM &&
sum bozbar frotz nitfol >M.sum && sum bozbar frotz nitfol >M.sum &&
@ -318,7 +318,7 @@ test_expect_success \
'rm -f .git/index && 'rm -f .git/index &&
echo DF >DF && echo DF >DF &&
git update-index --add DF && git update-index --add DF &&
treeDF=`git write-tree` && treeDF=$(git write-tree) &&
echo treeDF $treeDF && echo treeDF $treeDF &&
git ls-tree $treeDF && git ls-tree $treeDF &&
@ -326,7 +326,7 @@ test_expect_success \
mkdir DF && mkdir DF &&
echo DF/DF >DF/DF && echo DF/DF >DF/DF &&
git update-index --add --remove DF DF/DF && git update-index --add --remove DF DF/DF &&
treeDFDF=`git write-tree` && treeDFDF=$(git write-tree) &&
echo treeDFDF $treeDFDF && echo treeDFDF $treeDFDF &&
git ls-tree $treeDFDF && git ls-tree $treeDFDF &&
git ls-files --stage >DFDF.out' git ls-files --stage >DFDF.out'

2
t/t1003-read-tree-prefix.sh
View file

@ -11,7 +11,7 @@ test_description='git read-tree --prefix test.
test_expect_success setup ' test_expect_success setup '
echo hello >one && echo hello >one &&
git update-index --add one && git update-index --add one &&
tree=`git write-tree` && tree=$(git write-tree) &&
echo tree is $tree echo tree is $tree
' '

8
t/t1004-read-tree-m-u-wf.sh
View file

@ -30,7 +30,7 @@ test_expect_success 'two-way not clobbering' '
echo >file2 master creates untracked file2 && echo >file2 master creates untracked file2 &&
echo >subdir/file2 master creates untracked subdir/file2 && echo >subdir/file2 master creates untracked subdir/file2 &&
if err=`read_tree_u_must_succeed -m -u master side 2>&1` if err=$(read_tree_u_must_succeed -m -u master side 2>&1)
then then
echo should have complained echo should have complained
false false
@ -43,7 +43,7 @@ echo file2 >.gitignore
test_expect_success 'two-way with incorrect --exclude-per-directory (1)' ' test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
if err=`read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1` if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1)
then then
echo should have complained echo should have complained
false false
@ -54,7 +54,7 @@ test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
test_expect_success 'two-way with incorrect --exclude-per-directory (2)' ' test_expect_success 'two-way with incorrect --exclude-per-directory (2)' '
if err=`read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1` if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1)
then then
echo should have complained echo should have complained
false false
@ -95,7 +95,7 @@ test_expect_success 'three-way not clobbering a working tree file' '
git checkout master && git checkout master &&
echo >file3 file three created in master, untracked && echo >file3 file three created in master, untracked &&
echo >subdir/file3 file three created in master, untracked && echo >subdir/file3 file three created in master, untracked &&
if err=`read_tree_u_must_succeed -m -u branch-point master side 2>&1` if err=$(read_tree_u_must_succeed -m -u branch-point master side 2>&1)
then then
echo should have complained echo should have complained
false false

22
t/t1020-subdirectory.sh
View file

@ -20,27 +20,27 @@ test_expect_success setup '
test_expect_success 'update-index and ls-files' ' test_expect_success 'update-index and ls-files' '
git update-index --add one && git update-index --add one &&
case "`git ls-files`" in case "$(git ls-files)" in
one) echo pass one ;; one) echo pass one ;;
*) echo bad one; exit 1 ;; *) echo bad one; exit 1 ;;
esac && esac &&
( (
cd dir && cd dir &&
git update-index --add two && git update-index --add two &&
case "`git ls-files`" in case "$(git ls-files)" in
two) echo pass two ;; two) echo pass two ;;
*) echo bad two; exit 1 ;; *) echo bad two; exit 1 ;;
esac esac
) && ) &&
case "`git ls-files`" in case "$(git ls-files)" in
dir/two"$LF"one) echo pass both ;; dir/two"$LF"one) echo pass both ;;
*) echo bad; exit 1 ;; *) echo bad; exit 1 ;;
esac esac
' '
test_expect_success 'cat-file' ' test_expect_success 'cat-file' '
two=`git ls-files -s dir/two` && two=$(git ls-files -s dir/two) &&
two=`expr "$two" : "[0-7]* \\([0-9a-f]*\\)"` && two=$(expr "$two" : "[0-7]* \\([0-9a-f]*\\)") &&
echo "$two" && echo "$two" &&
git cat-file -p "$two" >actual && git cat-file -p "$two" >actual &&
cmp dir/two actual && cmp dir/two actual &&
@ -55,18 +55,18 @@ rm -f actual dir/actual
test_expect_success 'diff-files' ' test_expect_success 'diff-files' '
echo a >>one && echo a >>one &&
echo d >>dir/two && echo d >>dir/two &&
case "`git diff-files --name-only`" in case "$(git diff-files --name-only)" in
dir/two"$LF"one) echo pass top ;; dir/two"$LF"one) echo pass top ;;
*) echo bad top; exit 1 ;; *) echo bad top; exit 1 ;;
esac && esac &&
# diff should not omit leading paths # diff should not omit leading paths
( (
cd dir && cd dir &&
case "`git diff-files --name-only`" in case "$(git diff-files --name-only)" in
dir/two"$LF"one) echo pass subdir ;; dir/two"$LF"one) echo pass subdir ;;
*) echo bad subdir; exit 1 ;; *) echo bad subdir; exit 1 ;;
esac && esac &&
case "`git diff-files --name-only .`" in case "$(git diff-files --name-only .)" in
dir/two) echo pass subdir limited ;; dir/two) echo pass subdir limited ;;
*) echo bad subdir limited; exit 1 ;; *) echo bad subdir limited; exit 1 ;;
esac esac
@ -74,11 +74,11 @@ test_expect_success 'diff-files' '
' '
test_expect_success 'write-tree' ' test_expect_success 'write-tree' '
top=`git write-tree` && top=$(git write-tree) &&
echo $top && echo $top &&
( (
cd dir && cd dir &&
sub=`git write-tree` && sub=$(git write-tree) &&
echo $sub && echo $sub &&
test "z$top" = "z$sub" test "z$top" = "z$sub"
) )
@ -96,7 +96,7 @@ test_expect_success 'checkout-index' '
test_expect_success 'read-tree' ' test_expect_success 'read-tree' '
rm -f one dir/two && rm -f one dir/two &&
tree=`git write-tree` && tree=$(git write-tree) &&
read_tree_u_must_succeed --reset -u "$tree" && read_tree_u_must_succeed --reset -u "$tree" &&
cmp one original.one && cmp one original.one &&
cmp dir/two original.two && cmp dir/two original.two &&

4
t/t1050-large.sh
View file

@ -131,7 +131,7 @@ test_expect_success 'git-show a large file' '
' '
test_expect_success 'index-pack' ' test_expect_success 'index-pack' '
git clone file://"`pwd`"/.git foo && git clone file://"$(pwd)"/.git foo &&
GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack
' '
@ -140,7 +140,7 @@ test_expect_success 'repack' '
' '
test_expect_success 'pack-objects with large loose object' ' test_expect_success 'pack-objects with large loose object' '
SHA1=`git hash-object huge` && SHA1=$(git hash-object huge) &&
test_create_repo loose && test_create_repo loose &&
echo $SHA1 | git pack-objects --stdout | echo $SHA1 | git pack-objects --stdout |
GIT_ALLOC_LIMIT=0 GIT_DIR=loose/.git git unpack-objects && GIT_ALLOC_LIMIT=0 GIT_DIR=loose/.git git unpack-objects &&

4
t/t3905-stash-include-untracked.sh
View file

@ -96,8 +96,8 @@ test_expect_success 'stash pop after save --include-untracked leaves files untra
git stash pop && git stash pop &&
git status --porcelain >actual && git status --porcelain >actual &&
test_cmp expect actual && test_cmp expect actual &&
test "1" = "`cat file2`" && test "1" = "$(cat file2)" &&
test untracked = "`cat untracked/untracked`" test untracked = "$(cat untracked/untracked)"
' '
git clean --force --quiet -d git clean --force --quiet -d

16
t/t3910-mac-os-precompose.sh
View file

@ -14,13 +14,13 @@ then
fi fi
# create utf-8 variables # create utf-8 variables
Adiarnfc=`printf '\303\204'` Adiarnfc=$(printf '\303\204')
Adiarnfd=`printf 'A\314\210'` Adiarnfd=$(printf 'A\314\210')
Odiarnfc=`printf '\303\226'` Odiarnfc=$(printf '\303\226')
Odiarnfd=`printf 'O\314\210'` Odiarnfd=$(printf 'O\314\210')
AEligatu=`printf '\303\206'` AEligatu=$(printf '\303\206')
Invalidu=`printf '\303\377'` Invalidu=$(printf '\303\377')
#Create a string with 255 bytes (decomposed) #Create a string with 255 bytes (decomposed)
@ -35,7 +35,7 @@ Alongc=$Alongc$Alongc$Alongc$Alongc$Alongc #250 Byte
Alongc=$Alongc$AEligatu$AEligatu #254 Byte Alongc=$Alongc$AEligatu$AEligatu #254 Byte
test_expect_success "detect if nfd needed" ' test_expect_success "detect if nfd needed" '
precomposeunicode=`git config core.precomposeunicode` && precomposeunicode=$(git config core.precomposeunicode) &&
test "$precomposeunicode" = true && test "$precomposeunicode" = true &&
git config core.precomposeunicode true git config core.precomposeunicode true
' '
@ -146,7 +146,7 @@ test_expect_success "respect git config --global core.precomposeunicode" '
git config --global core.precomposeunicode true && git config --global core.precomposeunicode true &&
rm -rf .git && rm -rf .git &&
git init && git init &&
precomposeunicode=`git config core.precomposeunicode` && precomposeunicode=$(git config core.precomposeunicode) &&
test "$precomposeunicode" = "true" test "$precomposeunicode" = "true"
' '

2
t/t4006-diff-mode.sh
View file

@ -13,7 +13,7 @@ sed_script='s/\(:100644 100755\) \('"$_x40"'\) \2 /\1 X X /'
test_expect_success 'setup' ' test_expect_success 'setup' '
echo frotz >rezrov && echo frotz >rezrov &&
git update-index --add rezrov && git update-index --add rezrov &&
tree=`git write-tree` && tree=$(git write-tree) &&
echo $tree echo $tree
' '

4
t/t4010-diff-pathspec.sh
View file

@ -18,7 +18,7 @@ test_expect_success \
mkdir path1 && mkdir path1 &&
echo rezrov >path1/file1 && echo rezrov >path1/file1 &&
git update-index --add file0 path1/file1 && git update-index --add file0 path1/file1 &&
tree=`git write-tree` && tree=$(git write-tree) &&
echo "$tree" && echo "$tree" &&
echo nitfol >file0 && echo nitfol >file0 &&
echo yomin >path1/file1 && echo yomin >path1/file1 &&
@ -131,7 +131,7 @@ test_expect_success 'diff multiple wildcard pathspecs' '
mkdir path2 && mkdir path2 &&
echo rezrov >path2/file1 && echo rezrov >path2/file1 &&
git update-index --add path2/file1 && git update-index --add path2/file1 &&
tree3=`git write-tree` && tree3=$(git write-tree) &&
git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual && git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
cat <<-\EOF >expect && cat <<-\EOF >expect &&
path1/file1 path1/file1

16
t/t4012-diff-binary.sh
View file

@ -67,18 +67,18 @@ test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
git diff >output && git diff >output &&
sed -e "s/-CIT/xCIT/" <output >broken && sed -e "s/-CIT/xCIT/" <output >broken &&
test_must_fail git apply --stat --summary broken 2>detected && test_must_fail git apply --stat --summary broken 2>detected &&
detected=`cat detected` && detected=$(cat detected) &&
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") &&
detected=`sed -ne "${detected}p" broken` && detected=$(sed -ne "${detected}p" broken) &&
test "$detected" = xCIT test "$detected" = xCIT
' '
test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' ' test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
git diff --binary | sed -e "s/-CIT/xCIT/" >broken && git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
test_must_fail git apply --stat --summary broken 2>detected && test_must_fail git apply --stat --summary broken 2>detected &&
detected=`cat detected` && detected=$(cat detected) &&
detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` && detected=$(expr "$detected" : "fatal.*at line \\([0-9]*\\)\$") &&
detected=`sed -ne "${detected}p" broken` && detected=$(sed -ne "${detected}p" broken) &&
test "$detected" = xCIT test "$detected" = xCIT
' '
@ -88,7 +88,7 @@ test_expect_success 'initial commit' 'git commit -a -m initial'
test_expect_success 'diff-index with --binary' ' test_expect_success 'diff-index with --binary' '
echo AIT >a && mv b e && echo CIT >c && cat e >d && echo AIT >a && mv b e && echo CIT >c && cat e >d &&
git update-index --add --remove a b c d e && git update-index --add --remove a b c d e &&
tree0=`git write-tree` && tree0=$(git write-tree) &&
git diff --cached --binary >current && git diff --cached --binary >current &&
git apply --stat --summary current git apply --stat --summary current
' '
@ -96,7 +96,7 @@ test_expect_success 'diff-index with --binary' '
test_expect_success 'apply binary patch' ' test_expect_success 'apply binary patch' '
git reset --hard && git reset --hard &&
git apply --binary --index <current && git apply --binary --index <current &&
tree1=`git write-tree` && tree1=$(git write-tree) &&
test "$tree1" = "$tree0" test "$tree1" = "$tree0"
' '

6
t/t4013-diff-various.sh
View file

@ -107,14 +107,14 @@ test_expect_success setup '
+*++ [initial] Initial +*++ [initial] Initial
EOF EOF
V=`git version | sed -e 's/^git version //' -e 's/\./\\./g'` V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
while read cmd while read cmd
do do
case "$cmd" in case "$cmd" in
'' | '#'*) continue ;; '' | '#'*) continue ;;
esac esac
test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'` test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g')
pfx=`printf "%04d" $test_count` pfx=$(printf "%04d" $test_count)
expect="$TEST_DIRECTORY/t4013/diff.$test" expect="$TEST_DIRECTORY/t4013/diff.$test"
actual="$pfx-diff.$test" actual="$pfx-diff.$test"

10
t/t4014-format-patch.sh
View file

@ -43,7 +43,7 @@ test_expect_success setup '
test_expect_success "format-patch --ignore-if-in-upstream" ' test_expect_success "format-patch --ignore-if-in-upstream" '
git format-patch --stdout master..side >patch0 && git format-patch --stdout master..side >patch0 &&
cnt=`grep "^From " patch0 | wc -l` && cnt=$(grep "^From " patch0 | wc -l) &&
test $cnt = 3 test $cnt = 3
' '
@ -52,7 +52,7 @@ test_expect_success "format-patch --ignore-if-in-upstream" '
git format-patch --stdout \ git format-patch --stdout \
--ignore-if-in-upstream master..side >patch1 && --ignore-if-in-upstream master..side >patch1 &&
cnt=`grep "^From " patch1 | wc -l` && cnt=$(grep "^From " patch1 | wc -l) &&
test $cnt = 2 test $cnt = 2
' '
@ -69,7 +69,7 @@ test_expect_success "format-patch doesn't consider merge commits" '
git checkout -b merger master && git checkout -b merger master &&
test_tick && test_tick &&
git merge --no-ff slave && git merge --no-ff slave &&
cnt=`git format-patch -3 --stdout | grep "^From " | wc -l` && cnt=$(git format-patch -3 --stdout | grep "^From " | wc -l) &&
test $cnt = 3 test $cnt = 3
' '
@ -77,7 +77,7 @@ test_expect_success "format-patch result applies" '
git checkout -b rebuild-0 master && git checkout -b rebuild-0 master &&
git am -3 patch0 && git am -3 patch0 &&
cnt=`git rev-list master.. | wc -l` && cnt=$(git rev-list master.. | wc -l) &&
test $cnt = 2 test $cnt = 2
' '
@ -85,7 +85,7 @@ test_expect_success "format-patch --ignore-if-in-upstream result applies" '
git checkout -b rebuild-1 master && git checkout -b rebuild-1 master &&
git am -3 patch1 && git am -3 patch1 &&
cnt=`git rev-list master.. | wc -l` && cnt=$(git rev-list master.. | wc -l) &&
test $cnt = 2 test $cnt = 2
' '

2
t/t4036-format-patch-signer-mime.sh
View file

@ -42,7 +42,7 @@ test_expect_success 'attach and signoff do not duplicate mime headers' '
GIT_COMMITTER_NAME="はまの ふにおう" \ GIT_COMMITTER_NAME="はまの ふにおう" \
git format-patch -s --stdout -1 --attach >output && git format-patch -s --stdout -1 --attach >output &&
test `grep -ci ^MIME-Version: output` = 1 test $(grep -ci ^MIME-Version: output) = 1
' '

2
t/t4038-diff-combined.sh
View file

@ -94,7 +94,7 @@ test_expect_success 'setup for --cc --raw' '
blob=$(echo file | git hash-object --stdin -w) && blob=$(echo file | git hash-object --stdin -w) &&
base_tree=$(echo "100644 blob $blob file" | git mktree) && base_tree=$(echo "100644 blob $blob file" | git mktree) &&
trees= && trees= &&
for i in `test_seq 1 40` for i in $(test_seq 1 40)
do do
blob=$(echo file$i | git hash-object --stdin -w) && blob=$(echo file$i | git hash-object --stdin -w) &&
trees="$trees$(echo "100644 blob $blob file" | git mktree)$LF" trees="$trees$(echo "100644 blob $blob file" | git mktree)$LF"

2
t/t4057-diff-combined-paths.sh
View file

@ -5,7 +5,7 @@ test_description='combined diff show only paths that are different to all parent
. ./test-lib.sh . ./test-lib.sh
# verify that diffc.expect matches output of # verify that diffc.expect matches output of
# `git diff -c --name-only HEAD HEAD^ HEAD^2` # $(git diff -c --name-only HEAD HEAD^ HEAD^2)
diffc_verify () { diffc_verify () {
git diff -c --name-only HEAD HEAD^ HEAD^2 >diffc.actual && git diff -c --name-only HEAD HEAD^ HEAD^2 >diffc.actual &&
test_cmp diffc.expect diffc.actual test_cmp diffc.expect diffc.actual

12
t/t4116-apply-reverse.sh
View file

@ -30,10 +30,10 @@ test_expect_success setup '
test_expect_success 'apply in forward' ' test_expect_success 'apply in forward' '
T0=`git rev-parse "second^{tree}"` && T0=$(git rev-parse "second^{tree}") &&
git reset --hard initial && git reset --hard initial &&
git apply --index --binary patch && git apply --index --binary patch &&
T1=`git write-tree` && T1=$(git write-tree) &&
test "$T0" = "$T1" test "$T0" = "$T1"
' '
@ -62,22 +62,22 @@ test_expect_success 'setup separate repository lacking postimage' '
test_expect_success 'apply in forward without postimage' ' test_expect_success 'apply in forward without postimage' '
T0=`git rev-parse "second^{tree}"` && T0=$(git rev-parse "second^{tree}") &&
( (
cd initial && cd initial &&
git apply --index --binary ../patch && git apply --index --binary ../patch &&
T1=`git write-tree` && T1=$(git write-tree) &&
test "$T0" = "$T1" test "$T0" = "$T1"
) )
' '
test_expect_success 'apply in reverse without postimage' ' test_expect_success 'apply in reverse without postimage' '
T0=`git rev-parse "initial^{tree}"` && T0=$(git rev-parse "initial^{tree}") &&
( (
cd second && cd second &&
git apply --index --binary --reverse ../patch && git apply --index --binary --reverse ../patch &&
T1=`git write-tree` && T1=$(git write-tree) &&
test "$T0" = "$T1" test "$T0" = "$T1"
) )
' '

2
t/t4119-apply-config.sh
View file

@ -68,7 +68,7 @@ test_expect_success 'apply --whitespace=strip from config' '
check_result sub/file1 check_result sub/file1
' '
D=`pwd` D=$(pwd)
test_expect_success 'apply --whitespace=strip in subdir' ' test_expect_success 'apply --whitespace=strip in subdir' '

4
t/t4204-patch-id.sh
View file

@ -45,8 +45,8 @@ test_expect_success 'patch-id supports git-format-patch output' '
git checkout same && git checkout same &&
git format-patch -1 --stdout | calc_patch_id same && git format-patch -1 --stdout | calc_patch_id same &&
test_cmp patch-id_master patch-id_same && test_cmp patch-id_master patch-id_same &&
set `git format-patch -1 --stdout | git patch-id` && set $(git format-patch -1 --stdout | git patch-id) &&
test "$2" = `git rev-parse HEAD` test "$2" = $(git rev-parse HEAD)
' '
test_expect_success 'whitespace is irrelevant in footer' ' test_expect_success 'whitespace is irrelevant in footer' '

6
t/t5000-tar-tree.sh
View file

@ -123,7 +123,7 @@ test_expect_success \
'add files to repository' \ 'add files to repository' \
'find a -type f | xargs git update-index --add && 'find a -type f | xargs git update-index --add &&
find a -type l | xargs git update-index --add && find a -type l | xargs git update-index --add &&
treeid=`git write-tree` && treeid=$(git write-tree) &&
echo $treeid >treeid && echo $treeid >treeid &&
git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \ git update-ref HEAD $(TZ=GMT GIT_COMMITTER_DATE="2005-05-27 22:00:00" \
git commit-tree $treeid </dev/null)' git commit-tree $treeid </dev/null)'
@ -207,7 +207,7 @@ test_expect_success \
test_expect_success 'clients cannot access unreachable commits' ' test_expect_success 'clients cannot access unreachable commits' '
test_commit unreachable && test_commit unreachable &&
sha1=`git rev-parse HEAD` && sha1=$(git rev-parse HEAD) &&
git reset --hard HEAD^ && git reset --hard HEAD^ &&
git archive $sha1 >remote.tar && git archive $sha1 >remote.tar &&
test_must_fail git archive --remote=. $sha1 >remote.tar test_must_fail git archive --remote=. $sha1 >remote.tar
@ -215,7 +215,7 @@ test_expect_success 'clients cannot access unreachable commits' '
test_expect_success 'upload-archive can allow unreachable commits' ' test_expect_success 'upload-archive can allow unreachable commits' '
test_commit unreachable1 && test_commit unreachable1 &&
sha1=`git rev-parse HEAD` && sha1=$(git rev-parse HEAD) &&
git reset --hard HEAD^ && git reset --hard HEAD^ &&
git archive $sha1 >remote.tar && git archive $sha1 >remote.tar &&
test_config uploadarchive.allowUnreachable true && test_config uploadarchive.allowUnreachable true &&