diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-13 13:34:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-13 13:34:40 -0700 |
| commit | 43d151a1b087db22e2f9a754772b469de1194f67 (patch) | |
| tree | 49f381570791ba6c56619bc737c78fe245a9f42e /t/t9110-git-svn-use-svm-props.sh | |
| parent | f987afa8fe13c2a1512094362b06172419977bc4 (diff) | |
| parent | 4a1bb4c3f87f355dd52fcd0babcbd005d59d7ed6 (diff) | |
| download | git-43d151a1b087db22e2f9a754772b469de1194f67.tar.gz | |
Merge branch 'maint'
* maint:
git-svn: don't attempt to minimize URLs by default
git-svn: fix segfaults due to initial SVN pool being cleared
git-svn: clean up caching of SVN::Ra functions
git-svn: don't drop the username from URLs when dcommit is run
RPM spec: include files in technical/ to package.
Remove stale non-static-inline prototype for tree_entry_extract()
git-config: test for 'do not forget "a.b.var" ends "a.var" section'.
git-config: do not forget seeing "a.b.var" means we are out of "a.var" section.
Diffstat (limited to 't/t9110-git-svn-use-svm-props.sh')
| -rwxr-xr-x | t/t9110-git-svn-use-svm-props.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/t/t9110-git-svn-use-svm-props.sh b/t/t9110-git-svn-use-svm-props.sh index 9db0d8fd8d..59e17f2663 100755 --- a/t/t9110-git-svn-use-svm-props.sh +++ b/t/t9110-git-svn-use-svm-props.sh @@ -9,9 +9,10 @@ test_description='git-svn useSvmProps test' test_expect_success 'load svm repo' " svnadmin load -q $rawsvnrepo < ../t9110/svm.dump && - git-svn init -R arr -i bar $svnrepo/mirror/arr && - git-svn init -R argh -i dir $svnrepo/mirror/argh && - git-svn init -R argh -i e $svnrepo/mirror/argh/a/b/c/d/e && + git-svn init --minimize-url -R arr -i bar $svnrepo/mirror/arr && + git-svn init --minimize-url -R argh -i dir $svnrepo/mirror/argh && + git-svn init --minimize-url -R argh -i e \ + $svnrepo/mirror/argh/a/b/c/d/e && git-config svn.useSvmProps true && git-svn fetch --all " |