undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t9107-git-svn-migrate.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
	perl -i -pe 'BEGIN{undef $/;} s/`(.+?)`/\$(\1)/smg'  "${_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 2016-01-12 10:45:13 +00:00 committed by Junio C Hamano
parent 32858a0150
commit 8823d2fa79
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
t/t9107-git-svn-migrate.sh
View File

@ -24,10 +24,10 @@ test_expect_success 'setup old-looking metadata' '
git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn} git update-ref -d refs/${remotes_git_svn} refs/${remotes_git_svn}
' '
head=`git rev-parse --verify refs/heads/git-svn-HEAD^0` head=$(git rev-parse --verify refs/heads/git-svn-HEAD^0)
test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'" test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
svnrepo_escaped=`echo $svnrepo | sed 's/ /%20/'` svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
test_expect_success 'initialize old-style (v0) git svn layout' ' test_expect_success 'initialize old-style (v0) git svn layout' '
mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info && mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
@ -38,7 +38,7 @@ test_expect_success 'initialize old-style (v0) git svn layout' '
git rev-parse --verify refs/${remotes_git_svn}^0 && git rev-parse --verify refs/${remotes_git_svn}^0 &&
git rev-parse --verify refs/remotes/svn^0 && git rev-parse --verify refs/remotes/svn^0 &&
test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" && test "$(git config --get svn-remote.svn.url)" = "$svnrepo_escaped" &&
test `git config --get svn-remote.svn.fetch` = \ test $(git config --get svn-remote.svn.fetch) = \
":refs/${remotes_git_svn}" ":refs/${remotes_git_svn}"
' '
@ -46,10 +46,10 @@ test_expect_success 'initialize a multi-repository repo' '
git svn init "$svnrepo" -T trunk -t tags -b branches && git svn init "$svnrepo" -T trunk -t tags -b branches &&
git config --get-all svn-remote.svn.fetch > fetch.out && git config --get-all svn-remote.svn.fetch > fetch.out &&
grep "^trunk:refs/remotes/origin/trunk$" fetch.out && grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
test -n "`git config --get svn-remote.svn.branches \ test -n "$(git config --get svn-remote.svn.branches \
"^branches/\*:refs/remotes/origin/\*$"`" && "^branches/\*:refs/remotes/origin/\*$")" &&
test -n "`git config --get svn-remote.svn.tags \ test -n "$(git config --get svn-remote.svn.tags \
"^tags/\*:refs/remotes/origin/tags/\*$"`" && "^tags/\*:refs/remotes/origin/tags/\*$")" &&
git config --unset svn-remote.svn.branches \ git config --unset svn-remote.svn.branches \
"^branches/\*:refs/remotes/origin/\*$" && "^branches/\*:refs/remotes/origin/\*$" &&
git config --unset svn-remote.svn.tags \ git config --unset svn-remote.svn.tags \
@ -75,28 +75,28 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
git rev-parse --verify refs/remotes/origin/\$i^0 >> refs.out || exit 1; git rev-parse --verify refs/remotes/origin/\$i^0 >> refs.out || exit 1;
done && done &&
test -z \"\`sort < refs.out | uniq -d\`\" && test -z \"\$(sort < refs.out | uniq -d)\" &&
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do for j in trunk a b tags/0.1 tags/0.2 tags/0.3; do
if test \$j != \$i; then continue; fi if test \$j != \$i; then continue; fi
test -z \"\`git diff refs/remotes/origin/\$i \ test -z \"\$(git diff refs/remotes/origin/\$i \
refs/remotes/origin/\$j\`\" ||exit 1; done; done refs/remotes/origin/\$j)\" ||exit 1; done; done
" "
test_expect_success 'migrate --minimize on old inited layout' ' test_expect_success 'migrate --minimize on old inited layout' '
git config --unset-all svn-remote.svn.fetch && git config --unset-all svn-remote.svn.fetch &&
git config --unset-all svn-remote.svn.url && git config --unset-all svn-remote.svn.url &&
rm -rf "$GIT_DIR"/svn && rm -rf "$GIT_DIR"/svn &&
for i in `cat fetch.out`; do for i in $(cat fetch.out); do
path=`expr $i : "\([^:]*\):.*$"` path=$(expr $i : "\([^:]*\):.*$")
ref=`expr $i : "[^:]*:\(refs/remotes/.*\)$"` ref=$(expr $i : "[^:]*:\(refs/remotes/.*\)$")
if test -z "$ref"; then continue; fi if test -z "$ref"; then continue; fi
if test -n "$path"; then path="/$path"; fi if test -n "$path"; then path="/$path"; fi
( mkdir -p "$GIT_DIR"/svn/$ref/info/ && ( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1; echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
done && done &&
git svn migrate --minimize && git svn migrate --minimize &&
test -z "`git config -l | grep "^svn-remote\.git-svn\."`" && test -z "$(git config -l | grep "^svn-remote\.git-svn\.")" &&
git config --get-all svn-remote.svn.fetch > fetch.out && git config --get-all svn-remote.svn.fetch > fetch.out &&
grep "^trunk:refs/remotes/origin/trunk$" fetch.out && grep "^trunk:refs/remotes/origin/trunk$" fetch.out &&
grep "^branches/a:refs/remotes/origin/a$" fetch.out && grep "^branches/a:refs/remotes/origin/a$" fetch.out &&