Skip to content

Commit 7d7097b

Browse files
john-caigitster
authored andcommitted
t9104-git-svn-follow-parent: modernize test format
Some tests still use the old format with four spaces indentation. Standardize the tests to the new format with tab indentation. Signed-off-by: John Cai <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent be1fce6 commit 7d7097b

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

t/t9104-git-svn-follow-parent.sh

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,51 +41,51 @@ test_expect_success 'init and fetch a moved directory' '
4141
'
4242

4343
test_expect_success 'init and fetch from one svn-remote' '
44-
git config svn-remote.svn.url "$svnrepo" &&
45-
git config --add svn-remote.svn.fetch \
46-
trunk:refs/remotes/svn/trunk &&
47-
git config --add svn-remote.svn.fetch \
48-
thunk:refs/remotes/svn/thunk &&
49-
git svn fetch -i svn/thunk &&
44+
git config svn-remote.svn.url "$svnrepo" &&
45+
git config --add svn-remote.svn.fetch \
46+
trunk:refs/remotes/svn/trunk &&
47+
git config --add svn-remote.svn.fetch \
48+
thunk:refs/remotes/svn/thunk &&
49+
git svn fetch -i svn/thunk &&
5050
test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
51-
= "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
51+
= "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
5252
git cat-file blob refs/remotes/svn/thunk:readme >actual &&
5353
test "$(sed -n -e "3p" actual)" = goodbye
54-
'
54+
'
5555

5656
test_expect_success 'follow deleted parent' '
57-
(svn_cmd cp -m "resurrecting trunk as junk" \
58-
"$svnrepo"/trunk@2 "$svnrepo"/junk ||
59-
svn cp -m "resurrecting trunk as junk" \
60-
-r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
61-
git config --add svn-remote.svn.fetch \
62-
junk:refs/remotes/svn/junk &&
63-
git svn fetch -i svn/thunk &&
64-
git svn fetch -i svn/junk &&
57+
(svn_cmd cp -m "resurrecting trunk as junk" \
58+
"$svnrepo"/trunk@2 "$svnrepo"/junk ||
59+
svn cp -m "resurrecting trunk as junk" \
60+
-r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
61+
git config --add svn-remote.svn.fetch \
62+
junk:refs/remotes/svn/junk &&
63+
git svn fetch -i svn/thunk &&
64+
git svn fetch -i svn/junk &&
6565
test -z "$(git diff svn/junk svn/trunk)" &&
6666
test "$(git merge-base svn/junk svn/trunk)" \
67-
= "$(git rev-parse svn/trunk)"
68-
'
67+
= "$(git rev-parse svn/trunk)"
68+
'
6969

7070
test_expect_success 'follow larger parent' '
71-
mkdir -p import/trunk/thunk/bump/thud &&
72-
echo hi > import/trunk/thunk/bump/thud/file &&
73-
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
74-
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
75-
git svn init --minimize-url -i larger \
76-
"$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
77-
git svn fetch -i larger &&
71+
mkdir -p import/trunk/thunk/bump/thud &&
72+
echo hi > import/trunk/thunk/bump/thud/file &&
73+
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
74+
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
75+
git svn init --minimize-url -i larger \
76+
"$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
77+
git svn fetch -i larger &&
7878
git svn init --minimize-url -i larger-parent \
79-
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
79+
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
8080
git svn fetch -i larger-parent &&
81-
git rev-parse --verify refs/remotes/larger &&
82-
git rev-parse --verify \
83-
refs/remotes/larger-parent &&
81+
git rev-parse --verify refs/remotes/larger &&
82+
git rev-parse --verify \
83+
refs/remotes/larger-parent &&
8484
test "$(git merge-base \
8585
refs/remotes/larger-parent \
8686
refs/remotes/larger)" = \
87-
"$(git rev-parse refs/remotes/larger)"
88-
'
87+
"$(git rev-parse refs/remotes/larger)"
88+
'
8989

9090
test_expect_success 'follow higher-level parent' '
9191
svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&

0 commit comments

Comments
 (0)