git-svn: Save init/clone --ignore-paths in config

The --ignored-paths argument is now stored as
"svn-remote.$REMOTE_NAME.ignore-paths" in the config file.

[ew: edited subject and message]
Signed-off-by: Ben Jackson <ben@ben.com>
Acked-by: Eric Wong <normalperson@yhbt.net>

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index aad5e65c7022e9c3d0f33a2f51276bf4d5b47fa2..9229d45ad9a94047a7ce4f24543770ebc521ef61 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -85,6 +85,10 @@ COMMANDS
        specified, the prefix must include a trailing slash.
        Setting a prefix is useful if you wish to track multiple
        projects that share a common repository.
+--ignore-paths=<regex>;;
+       When passed to 'init' or 'clone' this regular expression will
+       be preserved as a config key.  See 'fetch' for a description
+       of '--ignore-paths'.
 
 'fetch'::
        Fetch unfetched revisions from the Subversion remote we are

diff --git a/git-svn.perl b/git-svn.perl
index 279847921ba4c2333af299535d41cb4b2d3bc750..bc3ba064e4343fd84535e38ecfd7ac691a644248 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -336,6 +336,9 @@ sub do_git_init_db {
                command_noisy('config', "$pfx.$i", $icv{$i});
                $set = $i;
        }
+       my $ignore_regex = \$SVN::Git::Fetcher::_ignore_regex;
+       command_noisy('config', "$pfx.ignore-paths", $$ignore_regex)
+               if defined $$ignore_regex;
 }
 
 sub init_subdir {

diff --git a/t/t9134-git-svn-ignore-paths.sh b/t/t9134-git-svn-ignore-paths.sh
index b9a15978ebd3126bbeeafe8447f49978d0c2f716..71fdc4a69dde2ff0bfdb092d8e28aeba495a1dc0 100755 (executable)
--- a/t/t9134-git-svn-ignore-paths.sh
+++ b/t/t9134-git-svn-ignore-paths.sh
@@ -40,10 +40,10 @@ test_expect_success 'init+fetch an SVN repository with ignored www directory' '
        test_cmp expect expect2
 '
 
-test_expect_success 'set persistent ignore-paths config' '
+test_expect_success 'verify ignore-paths config saved by clone' '
        (
            cd g &&
-           git config svn-remote.svn.ignore-paths "^www"
+           git config --get svn-remote.svn.ignore-paths | fgrep "www"
        )
 '