From a0f5a0c8285395d6eb2123e0c1ce78f900e1567c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 30 Nov 2016 00:45:41 +0000 Subject: git-svn: allow "0" in SVN path components Blindly checking a path component for falsiness is unwise, as "0" is false to Perl, but a valid pathname component for SVN (or any filesystem). Found via random code reading. Signed-off-by: Eric Wong diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm index e764696..56ad987 100644 --- a/perl/Git/SVN/Ra.pm +++ b/perl/Git/SVN/Ra.pm @@ -606,7 +606,7 @@ sub minimize_url { my $latest = $ra->get_latest_revnum; $ra->get_log("", $latest, 0, 1, 0, 1, sub {}); }; - } while ($@ && ($c = shift @components)); + } while ($@ && defined($c = shift @components)); return canonicalize_url($url); } -- cgit v0.10.2-6-g49f6 From ea9a93dcc2136b94f66991c9630f9f098e481f49 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 11 Dec 2016 00:06:46 +0000 Subject: git-svn: document useLogAuthor and addAuthorFrom config keys We've always supported these config keys in git-svn, so document them so users won't have to respecify them on every invocation. Reported-by: Juergen Kosel Signed-off-by: Eric Wong diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 5f9e65b..9bee9b0 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -664,13 +664,19 @@ creating the branch or tag. When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string. ++ +[verse] +config key: svn.useLogAuthor + --add-author-from:: 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 `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` will retrieve a valid author string for all commits. - ++ +[verse] +config key: svn.addAuthorFrom ADVANCED OPTIONS ---------------- -- cgit v0.10.2-6-g49f6