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

tests: subshell indentation stylefix

Browse Source 
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>
This commit is contained in:
Jonathan Nieder
2010-09-06 20:42:54 -05:00
committed by Junio C Hamano
parent 347c47e61e
commit 18a8269242
22 changed files with 260 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
t/t9106-git-svn-commit-diff-clobber.sh
View File

@ -6,9 +6,10 @@ test_description='git svn commit-diff clobber'
test_expect_success 'initialize repo' '
mkdir import &&
(cd import &&
echo initial > file &&
svn_cmd import -m "initial" . "$svnrepo"
(
cd import &&
echo initial >file &&
svn_cmd import -m "initial" . "$svnrepo"
) &&
echo initial > file &&
git update-index --add file &&
@ -16,10 +17,11 @@ test_expect_success 'initialize repo' '
'
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' '
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' "
test_expect_success 'commit another change from svn side' '
svn_cmd co "$svnrepo" t.svn &&
(cd t.svn &&
echo third line from svn >> file &&
(
cd t.svn &&
echo third line from svn >>file &&
poke file &&
svn_cmd commit -m "third line from svn"
) &&