summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <jnieuwenhuizen@novell.com>2008-07-28 11:20:18 +0000
committerJan Nieuwenhuizen <jnieuwenhuizen@novell.com>2008-07-28 11:20:18 +0000
commitfab7dfec2ca1a9d9de3adb6f0152c82b3fb9e421 (patch)
tree1e5375415a9ae4b3acd3889603f9901e0c17fe8d /git
parent15978edad20a147322250da45f84d1a1d91344af (diff)
Strip bits harder.
* git/git-svn.perl.diff: Strip bits harder.
Diffstat (limited to 'git')
-rw-r--r--git/git-svn.perl.diff10
1 files changed, 5 insertions, 5 deletions
diff --git a/git/git-svn.perl.diff b/git/git-svn.perl.diff
index 27764860b..942fdba55 100644
--- a/git/git-svn.perl.diff
+++ b/git/git-svn.perl.diff
@@ -1,6 +1,6 @@
-From f3148bd5b237c90d55e0f85642730011384c55ad Mon Sep 17 00:00:00 2001
+From 13a8a43f057875d8499bf2d0b99e57f79258bcf1 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
-Date: Fri, 25 Jul 2008 16:05:38 +0200
+Date: Mon, 28 Jul 2008 14:16:59 +0200
Subject: [PATCH] git-svn.perl: strip ChangeLog bits.
---
@@ -8,7 +8,7 @@ Subject: [PATCH] git-svn.perl: strip ChangeLog bits.
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
-index 2e0e552..c7ee218 100755
+index cf6dbbc..47524bf 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -66,7 +66,7 @@ my ($_stdin, $_help, $_edit,
@@ -37,7 +37,7 @@ index 2e0e552..c7ee218 100755
$log_entry{date} = parse_svn_date($log_entry{date});
+ if (defined $_cut_changelog_bits) {
-+ $log_entry{log} =~ s/^(\s*(199|200)}[0-9](-[0-9]{2}){2}\s+.*<.*>\n\s+)//;
++ $log_entry{log} =~ s/^((\n|\s)*(199|200)[0-9](-[0-9]{2}){2}\s+.*<.*>\s*\n\s+)//;
+ $log_entry{log} =~ s/(^|\n)\s*/$1/g;
+ $log_entry{log} =~ s/(^|\n)\* /\n$1/g;
+ # $log_entry{log} =~ s/(^|\n)\* [^ \t():]+\s*(\([^)]+\)([, \t\n]*))*\s*:\s*/$1\n/g;
@@ -50,5 +50,5 @@ index 2e0e552..c7ee218 100755
my $author = $log_entry{author} = check_author($log_entry{author});
my ($name, $email) = defined $::users{$author} ? @{$::users{$author}}
--
-1.5.6.3.317.g5d44c9.dirty
+1.6.0.rc0.44.g67270