[PATCH] git-svnimport: -r adds svn revision number to commit messages
From: Karl Hasselström <hidden>
Date: 2016-06-15 22:42:19
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
New -r flag for prepending the corresponding Subversion revision number to each commit message. Signed-off-by: Karl Hasselström <redacted> --- Documentation/git-svnimport.txt | 4 ++++ git-svnimport.perl | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) 2aad1f8f976b8bb2cd6fd3b225199373008e14b4
diff --git a/Documentation/git-svnimport.txt b/Documentation/git-svnimport.txt
index 63e28b8..5c543d5 100644
--- a/Documentation/git-svnimport.txt
+++ b/Documentation/git-svnimport.txt@@ -61,6 +61,10 @@ When importing incrementally, you might the git repository. Use this option if you want to import into a different branch. +-r:: + Prepend 'rX: ' to commit messages, where X is the imported + subversion revision. + -m:: Attempt to detect merges based on the commit message. This option will enable default regexes that try to capture the name source
diff --git a/git-svnimport.perl b/git-svnimport.perl
index f17d5a2..c536d70 100755
--- a/git-svnimport.perl
+++ b/git-svnimport.perl@@ -30,19 +30,19 @@ die "Need SVN:Core 1.2.1 or better" if $ $SIG{'PIPE'}="IGNORE"; $ENV{'TZ'}="UTC"; -our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,$opt_b,$opt_s,$opt_l,$opt_d,$opt_D); +our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T,$opt_b,$opt_r,$opt_s,$opt_l,$opt_d,$opt_D); sub usage() { print STDERR <<END; Usage: ${\basename $0} # fetch/update GIT from SVN [-o branch-for-HEAD] [-h] [-v] [-l max_rev] [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname] - [-d|-D] [-i] [-u] [-s start_chg] [-m] [-M regex] [SVN_URL] + [-d|-D] [-i] [-u] [-r] [-s start_chg] [-m] [-M regex] [SVN_URL] END exit(1); } -getopts("b:C:dDhil:mM:o:s:t:T:uv") or usage(); +getopts("b:C:dDhil:mM:o:rs:t:T:uv") or usage(); usage if $opt_h; my $tag_name = $opt_t || "tags";
@@ -650,6 +650,7 @@ sub commit { $pr->reader(); $message =~ s/[\s\n]+\z//; + $message = "r$revision: $message" if $opt_r; print $pw "$message\n" or die "Error writing to git-commit-tree: $!\n";
--
1.2.0.g812d