Merge branch 'ew/svn-fixes' into maint
Meant eventually for 'maint'. * ew/svn-fixes: git-svn: document useLogAuthor and addAuthorFrom config keys git-svn: allow "0" in SVN path components
This commit is contained in:
commit
844f7e61c9
@ -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
|
||||
----------------
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user