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

t9104-git-svn-follow-parent: modernize test format

Browse Source 
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>
This commit is contained in:
John Cai
2023-05-20 16:13:56 +00:00
committed by Junio C Hamano
parent be1fce6dae
commit 7d7097bf59
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
t/t9104-git-svn-follow-parent.sh
View File

@ -41,51 +41,51 @@ test_expect_success 'init and fetch a moved directory' '
' '
test_expect_success 'init and fetch from one svn-remote' ' test_expect_success 'init and fetch from one svn-remote' '
git config svn-remote.svn.url "$svnrepo" && git config svn-remote.svn.url "$svnrepo" &&
git config --add svn-remote.svn.fetch \ git config --add svn-remote.svn.fetch \
trunk:refs/remotes/svn/trunk && trunk:refs/remotes/svn/trunk &&
git config --add svn-remote.svn.fetch \ git config --add svn-remote.svn.fetch \
thunk:refs/remotes/svn/thunk && thunk:refs/remotes/svn/thunk &&
git svn fetch -i svn/thunk && git svn fetch -i svn/thunk &&
test "$(git rev-parse --verify refs/remotes/svn/trunk)" \ test "$(git rev-parse --verify refs/remotes/svn/trunk)" \
= "$(git rev-parse --verify refs/remotes/svn/thunk~1)" && = "$(git rev-parse --verify refs/remotes/svn/thunk~1)" &&
git cat-file blob refs/remotes/svn/thunk:readme >actual && git cat-file blob refs/remotes/svn/thunk:readme >actual &&
test "$(sed -n -e "3p" actual)" = goodbye test "$(sed -n -e "3p" actual)" = goodbye
' '
test_expect_success 'follow deleted parent' ' test_expect_success 'follow deleted parent' '
(svn_cmd cp -m "resurrecting trunk as junk" \ (svn_cmd cp -m "resurrecting trunk as junk" \
"$svnrepo"/trunk@2 "$svnrepo"/junk || "$svnrepo"/trunk@2 "$svnrepo"/junk ||
svn cp -m "resurrecting trunk as junk" \ svn cp -m "resurrecting trunk as junk" \
-r2 "$svnrepo"/trunk "$svnrepo"/junk) && -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
git config --add svn-remote.svn.fetch \ git config --add svn-remote.svn.fetch \
junk:refs/remotes/svn/junk && junk:refs/remotes/svn/junk &&
git svn fetch -i svn/thunk && git svn fetch -i svn/thunk &&
git svn fetch -i svn/junk && git svn fetch -i svn/junk &&
test -z "$(git diff svn/junk svn/trunk)" && test -z "$(git diff svn/junk svn/trunk)" &&
test "$(git merge-base svn/junk svn/trunk)" \ test "$(git merge-base svn/junk svn/trunk)" \
= "$(git rev-parse svn/trunk)" = "$(git rev-parse svn/trunk)"
' '
test_expect_success 'follow larger parent' ' test_expect_success 'follow larger parent' '
mkdir -p import/trunk/thunk/bump/thud && mkdir -p import/trunk/thunk/bump/thud &&
echo hi > import/trunk/thunk/bump/thud/file && echo hi > import/trunk/thunk/bump/thud/file &&
svn import -m "import a larger parent" import "$svnrepo"/larger-parent && svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger && svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
git svn init --minimize-url -i larger \ git svn init --minimize-url -i larger \
"$svnrepo"/larger-parent/trunk/thunk/bump/thud && "$svnrepo"/larger-parent/trunk/thunk/bump/thud &&
git svn fetch -i larger && git svn fetch -i larger &&
git svn init --minimize-url -i larger-parent \ git svn init --minimize-url -i larger-parent \
"$svnrepo"/another-larger/trunk/thunk/bump/thud && "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
git svn fetch -i larger-parent && git svn fetch -i larger-parent &&
git rev-parse --verify refs/remotes/larger && git rev-parse --verify refs/remotes/larger &&
git rev-parse --verify \ git rev-parse --verify \
refs/remotes/larger-parent && refs/remotes/larger-parent &&
test "$(git merge-base \ test "$(git merge-base \
refs/remotes/larger-parent \ refs/remotes/larger-parent \
refs/remotes/larger)" = \ refs/remotes/larger)" = \
"$(git rev-parse refs/remotes/larger)" "$(git rev-parse refs/remotes/larger)"
' '
test_expect_success 'follow higher-level parent' ' test_expect_success 'follow higher-level parent' '
svn mkdir -m "follow higher-level parent" "$svnrepo"/blob && svn mkdir -m "follow higher-level parent" "$svnrepo"/blob &&