diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-05-02 13:10:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-02 13:10:58 -0700 |
| commit | 06229a6ee09dc82e75b3c2442ff6fbb1d6fbbe3a (patch) | |
| tree | 0b5d3dfd4bcf26e4f20848db855fb5974be70e90 | |
| parent | f7003da0f498ee7621fad4ebd15778439e77fce2 (diff) | |
| parent | 7bbc458b44873d0027261562327a20ebd6a97733 (diff) | |
| download | git-06229a6ee09dc82e75b3c2442ff6fbb1d6fbbe3a.tar.gz | |
Merge branch 'km/git-svn-workaround-older-getopt-long'
* km/git-svn-workaround-older-getopt-long:
t9117: use --prefix "" instead of --prefix=""
| -rw-r--r-- | Documentation/git-svn.txt | 3 | ||||
| -rwxr-xr-x | t/t9117-git-svn-init-clone.sh | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 5b3c38de7f..fce585388c 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -91,6 +91,9 @@ COMMANDS NOTE: Before Git v2.0, the default prefix was "" (no prefix). This meant that SVN-tracking refs were put at "refs/remotes/*", which is incompatible with how Git's own remote-tracking refs are organized. +If you still want the old default, you can get it by passing +`--prefix ""` on the command line (`--prefix=""` may not work if +your Perl's Getopt::Long is < v2.37). --ignore-paths=<regex>;; When passed to 'init' or 'clone' this regular expression will diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh index dfed76fedc..a66f43c6b1 100755 --- a/t/t9117-git-svn-init-clone.sh +++ b/t/t9117-git-svn-init-clone.sh @@ -101,18 +101,18 @@ test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' ' rm -f warning ' -test_expect_success 'init with -s/-T/-b/-t and --prefix="" still works' ' +test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' ' test ! -d project && - git svn init -s "$svnrepo"/project project --prefix="" 2>warning && + git svn init -s "$svnrepo"/project project --prefix "" 2>warning && test_must_fail grep -q prefix warning && test_svn_configured_prefix "" && rm -rf project && rm -f warning ' -test_expect_success 'clone with -s/-T/-b/-t and --prefix="" still works' ' +test_expect_success 'clone with -s/-T/-b/-t and --prefix "" still works' ' test ! -d project && - git svn clone -s "$svnrepo"/project --prefix="" 2>warning && + git svn clone -s "$svnrepo"/project --prefix "" 2>warning && test_must_fail grep -q prefix warning && test_svn_configured_prefix "" && rm -rf project && |