summaryrefslogtreecommitdiff
path: root/t/t9150-svk-mergetickets.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t9150-svk-mergetickets.sh')
-rwxr-xr-xt/t9150-svk-mergetickets.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh
index dd0c2bad24..24c2421bfc 100755
--- a/t/t9150-svk-mergetickets.sh
+++ b/t/t9150-svk-mergetickets.sh
@@ -11,6 +11,7 @@ test_expect_success 'load svk depot' "
svnadmin load -q '$rawsvnrepo' \
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
git svn init --minimize-url -R svkmerge \
+ --rewrite-root=http://svn.example.org \
-T trunk -b branches '$svnrepo' &&
git svn fetch --all
"
@@ -18,7 +19,7 @@ test_expect_success 'load svk depot' "
uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
test_expect_success 'svk merges were represented coming in' "
- [ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
+ [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
"
test_done