summaryrefslogtreecommitdiff
path: root/t/t9101-git-svn-props.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-08 19:02:05 +0900
committerJunio C Hamano <gitster@pobox.com>2008-09-08 14:18:04 -0700
commit16805d3e59250769f409480ca3cb739281bc906c (patch)
treec447912506cacebaf3b7e5496196aa99abafd256 /t/t9101-git-svn-props.sh
parent24fa13cbb7c520f787370b471b4f04652fbb68d5 (diff)
downloadgit-16805d3e59250769f409480ca3cb739281bc906c.tar.gz
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>
Diffstat (limited to 't/t9101-git-svn-props.sh')
-rwxr-xr-xt/t9101-git-svn-props.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index f420796c31..02eccc91ba 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -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 &&