freshlybakedca.ke
Git fork
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 <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
authored by
John Cai
and committed by
Junio C Hamano
7d7097bf
be1fce6d
+31
-31
t/t9104-git-svn-follow-parent.sh
+31
-31
t/t9104-git-svn-follow-parent.sh
···
41
41
'
42
42
43
43
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 &&
50
50
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)" &&
52
52
git cat-file blob refs/remotes/svn/thunk:readme >actual &&
53
53
test "$(sed -n -e "3p" actual)" = goodbye
54
-
'
54
+
'
55
55
56
56
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 &&
65
65
test -z "$(git diff svn/junk svn/trunk)" &&
66
66
test "$(git merge-base svn/junk svn/trunk)" \
67
-
= "$(git rev-parse svn/trunk)"
68
-
'
67
+
= "$(git rev-parse svn/trunk)"
68
+
'
69
69
70
70
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 &&
78
78
git svn init --minimize-url -i larger-parent \
79
-
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
79
+
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
80
80
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 &&
84
84
test "$(git merge-base \
85
85
refs/remotes/larger-parent \
86
86
refs/remotes/larger)" = \
87
-
"$(git rev-parse refs/remotes/larger)"
88
-
'
87
+
"$(git rev-parse refs/remotes/larger)"
88
+
'
89
89
90
90
test_expect_success 'follow higher-level parent' '
91
91
svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&