kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ew/svn-fixes' 

* ew/svn-fixes:
  git-svn: document useLogAuthor and addAuthorFrom config keys
  git-svn: allow "0" in SVN path components
maint
Junio C Hamano 2016-12-13 14:09:27 -08:00
parent c04790a93a ea9a93dcc2
commit ad9d7346b3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-svn.txt
View File

@ -664,13 +664,19 @@ creating the branch or tag.
When retrieving svn commits into Git (as part of 'fetch', 'rebase', or When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
'dcommit' operations), look for the first `From:` or `Signed-off-by:` line 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
in the log message and use that as the author string. in the log message and use that as the author string.
+
[verse]
config key: svn.useLogAuthor

--add-author-from:: --add-author-from::
When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit' When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit'
operations), if the existing log message doesn't already have a operations), if the existing log message doesn't already have a
`From:` or `Signed-off-by:` line, append a `From:` line based on the `From:` or `Signed-off-by:` line, append a `From:` line based on the
Git commit's author string. If you use this, then `--use-log-author` Git commit's author string. If you use this, then `--use-log-author`
will retrieve a valid author string for all commits. will retrieve a valid author string for all commits.

+
[verse]
config key: svn.addAuthorFrom


ADVANCED OPTIONS ADVANCED OPTIONS
---------------- ----------------

2
perl/Git/SVN/Ra.pm
View File

@ -606,7 +606,7 @@ sub minimize_url {
my $latest = $ra->get_latest_revnum; my $latest = $ra->get_latest_revnum;
$ra->get_log("", $latest, 0, 1, 0, 1, sub {}); $ra->get_log("", $latest, 0, 1, 0, 1, sub {});
}; };
} while ($@ && ($c = shift @components)); } while ($@ && defined($c = shift @components));


return canonicalize_url($url); return canonicalize_url($url);
} }