From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:45 +0000 (-0700)
Subject: Merge branch 'ep/shell-command-substitution'
X-Git-Tag: v2.1.0-rc0~184
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6753d8a85d543253d95184ec2faad6dc197f2486;p=git

Merge branch 'ep/shell-command-substitution'

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
  ...
---

6753d8a85d543253d95184ec2faad6dc197f2486
diff --cc t/t0001-init.sh
index bbc9cb60dd,32821fe450..2f3020342a
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@@ -180,19 -240,29 +180,19 @@@ test_expect_success 'init with init.tem
  '
  
  test_expect_success 'init --bare/--shared overrides system/global config' '
 -	(
 -		test_config="$HOME"/.gitconfig &&
 -		git config -f "$test_config" core.bare false &&
 -		git config -f "$test_config" core.sharedRepository 0640 &&
 -		mkdir init-bare-shared-override &&
 -		cd init-bare-shared-override &&
 -		git init --bare --shared=0666
 -	) &&
 +	test_config_global core.bare false &&
 +	test_config_global core.sharedRepository 0640 &&
 +	git init --bare --shared=0666 init-bare-shared-override &&
  	check_config init-bare-shared-override true unset &&
  	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_config="$HOME"/.gitconfig &&
 -		git config -f "$test_config" core.sharedRepository 0666 &&
 -		mkdir shared-honor-global &&
 -		cd shared-honor-global &&
 -		git init
 -	) &&
 +	test_config_global core.sharedRepository 0666 &&
 +	git init shared-honor-global &&
  	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' '
@@@ -285,9 -374,9 +285,9 @@@ test_expect_success 'init prefers comma
  test_expect_success 'init with separate gitdir' '
  	rm -rf newdir &&
  	git init --separate-git-dir realgitdir newdir &&
- 	echo "gitdir: `pwd`/realgitdir" >expected &&
+ 	echo "gitdir: $(pwd)/realgitdir" >expected &&
  	test_cmp expected newdir/.git &&
 -	test -d realgitdir/refs
 +	test_path_is_dir realgitdir/refs
  '
  
  test_expect_success 're-init on .git file' '
@@@ -299,10 -388,10 +299,10 @@@ test_expect_success 're-init to update 
  	cd newdir &&
  	git init --separate-git-dir ../surrealgitdir
  	) &&
- 	echo "gitdir: `pwd`/surrealgitdir" >expected &&
+ 	echo "gitdir: $(pwd)/surrealgitdir" >expected &&
  	test_cmp expected newdir/.git &&
 -	test -d surrealgitdir/refs &&
 -	! test -d realgitdir/refs
 +	test_path_is_dir surrealgitdir/refs &&
 +	test_path_is_missing realgitdir/refs
  '
  
  test_expect_success 're-init to move gitdir' '
@@@ -312,9 -401,9 +312,9 @@@
  	cd newdir &&
  	git init --separate-git-dir ../realgitdir
  	) &&
- 	echo "gitdir: `pwd`/realgitdir" >expected &&
+ 	echo "gitdir: $(pwd)/realgitdir" >expected &&
  	test_cmp expected newdir/.git &&
 -	test -d realgitdir/refs
 +	test_path_is_dir realgitdir/refs
  '
  
  test_expect_success SYMLINKS 're-init to move gitdir symlink' '
@@@ -326,10 -415,10 +326,10 @@@
  	ln -s here .git &&
  	git init --separate-git-dir ../realgitdir
  	) &&
- 	echo "gitdir: `pwd`/realgitdir" >expected &&
+ 	echo "gitdir: $(pwd)/realgitdir" >expected &&
  	test_cmp expected newdir/.git &&
 -	test -d realgitdir/refs &&
 -	! test -d newdir/here
 +	test_cmp expected newdir/here &&
 +	test_path_is_dir realgitdir/refs
  '
  
  test_done