diff options
| author | Kyle J. McKay <mackyle@gmail.com> | 2014-04-22 04:16:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-23 09:42:28 -0700 |
| commit | 7bbc458b44873d0027261562327a20ebd6a97733 (patch) | |
| tree | e8255d70367cc5b943a3543c9ad105358a3c5e2d | |
| parent | 779792a5f24bb4e8049c4f88ad752e70d4a8a080 (diff) | |
| download | git-7bbc458b44873d0027261562327a20ebd6a97733.tar.gz | |
t9117: use --prefix "" instead of --prefix=""
Versions of Perl's Getopt::Long module before 2.37 do not contain
this fix that first appeared in Getopt::Long version 2.37:
* Bugfix: With gnu_compat, --foo= will no longer trigger "Option
requires an argument" but return the empty string.
Instead of using --prefix="" use --prefix "" when testing an
explictly empty prefix string in order to work with older versions
of Perl's Getopt::Long module.
Also add a paragraph on this workaround to the documentation of
git-svn itself.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 && |