diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-08 19:02:08 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-08 14:22:58 -0700 |
| commit | 1364ff27dc5ecca4c1932d8fa09fe88a7c09fda0 (patch) | |
| tree | 488065f50b761d9d9c9073d0283b8854cecc791a /t/t9106-git-svn-commit-diff-clobber.sh | |
| parent | 16805d3e59250769f409480ca3cb739281bc906c (diff) | |
| download | git-1364ff27dc5ecca4c1932d8fa09fe88a7c09fda0.tar.gz | |
t/t91XX git-svn tests: run "git svn" not "git-svn"
This replaces 'git-svn' with 'git svn' in the tests.
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 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh index da559f89b3..6eb0fd85c8 100755 --- a/t/t9106-git-svn-commit-diff-clobber.sh +++ b/t/t9106-git-svn-commit-diff-clobber.sh @@ -1,7 +1,7 @@ #!/bin/sh # # Copyright (c) 2006 Eric Wong -test_description='git-svn commit-diff clobber' +test_description='git svn commit-diff clobber' . ./lib-git-svn.sh test_expect_success 'initialize repo' ' @@ -27,7 +27,7 @@ test_expect_success 'commit change from svn side' ' test_expect_success 'commit conflicting change from git' ' echo second line from git >> file && git commit -a -m "second line from git" && - test_must_fail git-svn commit-diff -r1 HEAD~1 HEAD "$svnrepo" + test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo" ' test_expect_success 'commit complementing change from git' ' @@ -36,12 +36,12 @@ test_expect_success 'commit complementing change from git' ' git commit -a -m "second line from svn" && echo third line from git >> file && git commit -a -m "third line from git" && - git-svn commit-diff -r2 HEAD~1 HEAD "$svnrepo" + git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo" ' test_expect_success 'dcommit fails to commit because of conflict' ' - git-svn init "$svnrepo" && - git-svn fetch && + git svn init "$svnrepo" && + git svn fetch && git reset --hard refs/${remotes_git_svn} && svn co "$svnrepo" t.svn && cd t.svn && @@ -52,7 +52,7 @@ test_expect_success 'dcommit fails to commit because of conflict' ' rm -rf t.svn && echo "fourth line from git" >> file && git commit -a -m "fourth line from git" && - test_must_fail git-svn dcommit + test_must_fail git svn dcommit ' test_expect_success 'dcommit does the svn equivalent of an index merge' " @@ -63,7 +63,7 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' " echo 'more changes' >> file2 && git update-index file2 && git commit -a -m 'more changes' && - git-svn dcommit + git svn dcommit " test_expect_success 'commit another change from svn side' ' @@ -76,7 +76,7 @@ test_expect_success 'commit another change from svn side' ' rm -rf t.svn ' -test_expect_success 'multiple dcommit from git-svn will not clobber svn' " +test_expect_success 'multiple dcommit from git svn will not clobber svn' " git reset --hard refs/${remotes_git_svn} && echo new file >> new-file && git update-index --add new-file && |