diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-08 14:02:05 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-09 01:18:04 +0400 |
| commit | 16805d3e59250769f409480ca3cb739281bc906c (patch) | |
| tree | c447912506cacebaf3b7e5496196aa99abafd256 /t/t9106-git-svn-commit-diff-clobber.sh | |
| parent | 24fa13cbb7c520f787370b471b4f04652fbb68d5 (diff) | |
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/t9106-git-svn-commit-diff-clobber.sh')
| -rwxr-xr-x | t/t9106-git-svn-commit-diff-clobber.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index 83896e9687..da559f89b3 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -42,7 +42,7 @@ test_expect_success 'commit complementing change from git' ' test_expect_success 'dcommit fails to commit because of conflict' ' git-svn init "$svnrepo" && git-svn fetch && - git reset --hard refs/remotes/git-svn && + git reset --hard refs/${remotes_git_svn} && svn co "$svnrepo" t.svn && cd t.svn && echo fourth line from svn >> file && @@ -56,7 +56,7 @@ test_expect_success 'dcommit fails to commit because of conflict' ' ' test_expect_success 'dcommit does the svn equivalent of an index merge' " - git reset --hard refs/remotes/git-svn && + git reset --hard refs/${remotes_git_svn} && echo 'index merge' > file2 && git update-index --add file2 && git commit -a -m 'index merge' && @@ -77,7 +77,7 @@ test_expect_success 'commit another change from svn side' ' ' test_expect_success 'multiple dcommit from git-svn will not clobber svn' " - git reset --hard refs/remotes/git-svn && + git reset --hard refs/${remotes_git_svn} && echo new file >> new-file && git update-index --add new-file && git commit -a -m 'new file' && |