mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests breaking when checkout path contains shell metacharacters

Browse Source 
This fixes the remainder of the issues where the test script itself is at
fault for failing when the git checkout path contains whitespace or other
shell metacharacters.

The majority of git svn tests used the idiom

  test_expect_success "title" "test script using $svnrepo"

These were changed to have the test script in single-quotes:

  test_expect_success "title" 'test script using "$svnrepo"'

which unfortunately makes the patch appear larger than it really is.

One consequence of this change is that in the verbose test output the
value of $svnrepo (and in some cases other variables, too) is no
longer expanded, i.e. previously we saw

  * expecting success:
	test script using /path/to/git/t/trash/svnrepo

but now it is:

  * expecting success:
	test script using "$svnrepo"

Signed-off-by: Bryan Donlan <bdonlan@fushizen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Bryan Donlan
2008-05-04 01:37:59 -04:00
committed by Junio C Hamano
parent 0e46e70462
commit f69e836fab
39 changed files with 475 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
t/t9114-git-svn-dcommit-merge.sh
View File

@ -34,35 +34,35 @@ cat << EOF
EOF
}
test_expect_success 'setup svn repository' "
svn co $svnrepo mysvnwork &&
test_expect_success 'setup svn repository' '
svn co "$svnrepo" mysvnwork &&
mkdir -p mysvnwork/trunk &&
cd mysvnwork &&
big_text_block >> trunk/README &&
svn add trunk &&
svn ci -m 'first commit' trunk &&
svn ci -m "first commit" trunk &&
cd ..
"
'
test_expect_success 'setup git mirror and merge' "
git svn init $svnrepo -t tags -T trunk -b branches &&
test_expect_success 'setup git mirror and merge' '
git svn init "$svnrepo" -t tags -T trunk -b branches &&
git svn fetch &&
git checkout --track -b svn remotes/trunk &&
git checkout -b merge &&
echo new file > new_file &&
git add new_file &&
git commit -a -m 'New file' &&
git commit -a -m "New file" &&
echo hello >> README &&
git commit -a -m 'hello' &&
git commit -a -m "hello" &&
echo add some stuff >> new_file &&
git commit -a -m 'add some stuff' &&
git commit -a -m "add some stuff" &&
git checkout svn &&
mv -f README tmp &&
echo friend > README &&
cat tmp >> README &&
git commit -a -m 'friend' &&
git commit -a -m "friend" &&
git pull . merge
"
'
test_debug 'gitk --all & sleep 1'