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/t9100-git-svn-basic.sh | |
| parent | cvsserver: Limit config parser to needed options (diff) | |
| parent | git-svn: don't attempt to minimize URLs by default (diff) | |
| download | tgif-43d151a1b087db22e2f9a754772b469de1194f67.tar.xz | |
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/t9100-git-svn-basic.sh')
| -rwxr-xr-x | t/t9100-git-svn-basic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index eb628fe075..70c3669ee8 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -229,7 +229,7 @@ test_expect_failure 'exit if init-ing a would clobber a URL' " test_expect_success \ 'init allows us to connect to another directory in the same repo' " - git-svn init -i bar $svnrepo/bar && + git-svn init --minimize-url -i bar $svnrepo/bar && git config --get svn-remote.svn.fetch \ '^bar:refs/remotes/bar$' && git config --get svn-remote.svn.fetch \ |