Skip to content

Commit 844f7e6

Browse files
committed
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
2 parents af1a71f + ea9a93d commit 844f7e6

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Documentation/git-svn.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,13 +664,19 @@ creating the branch or tag.
664664
When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
665665
'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
666666
in the log message and use that as the author string.
667+
+
668+
[verse]
669+
config key: svn.useLogAuthor
670+
667671
--add-author-from::
668672
When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit'
669673
operations), if the existing log message doesn't already have a
670674
`From:` or `Signed-off-by:` line, append a `From:` line based on the
671675
Git commit's author string. If you use this, then `--use-log-author`
672676
will retrieve a valid author string for all commits.
673-
677+
+
678+
[verse]
679+
config key: svn.addAuthorFrom
674680

675681
ADVANCED OPTIONS
676682
----------------

perl/Git/SVN/Ra.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ sub minimize_url {
606606
my $latest = $ra->get_latest_revnum;
607607
$ra->get_log("", $latest, 0, 1, 0, 1, sub {});
608608
};
609-
} while ($@ && ($c = shift @components));
609+
} while ($@ && defined($c = shift @components));
610610

611611
return canonicalize_url($url);
612612
}

0 commit comments

Comments
 (0)