t/t91XX-svn: start removing use of "git-" from these tests
Subversion tests use too many "git-foo" form, so I am converting them in two steps. This first step replaces literal strings "remotes/git-svn" and "git-svn-id" by introducing $remotes_git_svn and $git_svn_id constants defined as shell variables. This will reduce the number of false hits from "git grep". Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
24fa13cbb7
commit
16805d3e59
@ -71,11 +71,11 @@ test_expect_success 'fetch revisions from svn' 'git-svn fetch'
|
||||
|
||||
name='test svn:keywords ignoring'
|
||||
test_expect_success "$name" \
|
||||
'git checkout -b mybranch remotes/git-svn &&
|
||||
'git checkout -b mybranch ${remotes_git_svn} &&
|
||||
echo Hi again >> kw.c &&
|
||||
git commit -a -m "test keywords ignoring" &&
|
||||
git-svn set-tree remotes/git-svn..mybranch &&
|
||||
git pull . remotes/git-svn'
|
||||
git-svn set-tree ${remotes_git_svn}..mybranch &&
|
||||
git pull . ${remotes_git_svn}'
|
||||
|
||||
expect='/* $Id$ */'
|
||||
got="`sed -ne 2p kw.c`"
|
||||
@ -91,7 +91,7 @@ test_expect_success "propset CR on crlf files" \
|
||||
|
||||
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
|
||||
'git-svn fetch &&
|
||||
git pull . remotes/git-svn &&
|
||||
git pull . ${remotes_git_svn} &&
|
||||
svn co "$svnrepo" new_wc'
|
||||
|
||||
for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf
|
||||
@ -113,7 +113,7 @@ cd test_wc
|
||||
svn commit -m "propset CRLF on cr files"'
|
||||
cd ..
|
||||
test_expect_success 'fetch and pull latest from svn' \
|
||||
'git-svn fetch && git pull . remotes/git-svn'
|
||||
'git-svn fetch && git pull . ${remotes_git_svn}'
|
||||
|
||||
b_cr="`git-hash-object cr`"
|
||||
b_ne_cr="`git-hash-object ne_cr`"
|
||||
@ -161,7 +161,7 @@ cat >create-ignore-index.expect <<\EOF
|
||||
EOF
|
||||
|
||||
test_expect_success 'test create-ignore' "
|
||||
git-svn fetch && git pull . remotes/git-svn &&
|
||||
git-svn fetch && git pull . ${remotes_git_svn} &&
|
||||
git-svn create-ignore &&
|
||||
cmp ./.gitignore create-ignore.expect &&
|
||||
cmp ./deeply/.gitignore create-ignore.expect &&
|
||||
|
Reference in New Issue
Block a user