Format the subshells introduced by the previous patch (Several tests:
cd inside subshell instead of around, 2010-09-06) like so:
(
cd subdir &&
...
) &&
This is generally easier to read and has the nice side-effect that
this patch will show what commands are used in the subshell, making
it easier to check for lost environment variables and similar
behavior changes.
Cc: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Nieder15 years agocommitted byJunio C Hamano
test_expect_success 'commit change from svn side' '
svn_cmd co "$svnrepo" t.svn &&
(cd t.svn &&
echo second line from svn >> file &&
poke file &&
svn_cmd commit -m "second line from svn"
(
cd t.svn &&
echo second line from svn >>file &&
poke file &&
svn_cmd commit -m "second line from svn"
) &&
rm -rf t.svn
'
@ -44,10 +46,11 @@ test_expect_success 'dcommit fails to commit because of conflict' '
@@ -44,10 +46,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 &&
echo fourth line from svn >> file &&
poke file &&
svn_cmd commit -m "fourth line from svn"
(
cd t.svn &&
echo fourth line from svn >>file &&
poke file &&
svn_cmd commit -m "fourth line from svn"
) &&
rm -rf t.svn &&
echo "fourth line from git" >> file &&
@ -68,8 +71,9 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' "
@@ -68,8 +71,9 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' "
test_expect_success 'commit another change from svn side' '