Several tests: cd inside subshell instead of around

Fixed all places where it was a straightforward change from cd'ing into a
directory and back via "cd .." to a cd inside a subshell.

Found these places with "git grep -w "cd \.\.".

Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jens Lehmann
2010-09-06 20:39:54 +02:00
committed by Junio C Hamano
parent af24059fa2
commit fd4ec4f2bb
32 changed files with 256 additions and 260 deletions

View File

@ -6,21 +6,21 @@ test_description='git svn commit-diff clobber'
test_expect_success 'initialize repo' '
mkdir import &&
cd import &&
(cd import &&
echo initial > file &&
svn_cmd import -m "initial" . "$svnrepo" &&
cd .. &&
svn_cmd import -m "initial" . "$svnrepo"
) &&
echo initial > file &&
git update-index --add file &&
git commit -a -m "initial"
'
test_expect_success 'commit change from svn side' '
svn_cmd co "$svnrepo" t.svn &&
cd t.svn &&
(cd t.svn &&
echo second line from svn >> file &&
poke file &&
svn_cmd commit -m "second line from svn" &&
cd .. &&
svn_cmd commit -m "second line from svn"
) &&
rm -rf t.svn
'
@ -44,11 +44,11 @@ test_expect_success 'dcommit fails to commit because of conflict' '
git svn fetch &&
git reset --hard refs/${remotes_git_svn} &&
svn_cmd co "$svnrepo" t.svn &&
cd t.svn &&
(cd t.svn &&
echo fourth line from svn >> file &&
poke file &&
svn_cmd commit -m "fourth line from svn" &&
cd .. &&
svn_cmd commit -m "fourth line from svn"
) &&
rm -rf t.svn &&
echo "fourth line from git" >> file &&
git commit -a -m "fourth line from git" &&
@ -68,11 +68,11 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' "
test_expect_success 'commit another change from svn side' '
svn_cmd co "$svnrepo" t.svn &&
cd t.svn &&
(cd t.svn &&
echo third line from svn >> file &&
poke file &&
svn_cmd commit -m "third line from svn" &&
cd .. &&
svn_cmd commit -m "third line from svn"
) &&
rm -rf t.svn
'