bug-vc-dwim
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Bug-vc-dwim] [PATCH] vc-dwim: avoid unfounded failure with two ChangeLo


From: Jim Meyering
Subject: [Bug-vc-dwim] [PATCH] vc-dwim: avoid unfounded failure with two ChangeLog file arguments
Date: Tue, 31 May 2011 22:29:05 +0200

FYI,

>From 255c7faff3dc83e8f3ddffdb95bc1afacf45be0b Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 28 May 2011 20:08:27 +0200
Subject: [PATCH] vc-dwim: avoid unfounded failure with two ChangeLog file
 arguments

* vc-dwim.pl (check_attribution): Also sanitize the author parameter.
Otherwise, "vc-dwim a/ChangeLog b/ChangeLog" would fail complaining
about mismatch between "name <email>" and "name  <email>".
* NEWS (Bug fixes): Mention it.
---
 NEWS       |    6 ++++++
 vc-dwim.pl |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 88dff6e..21b39f2 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ vc-dwim NEWS                                          -*- 
outline -*-

 * Noteworthy changes in release ?.? (????-??-??) [?]

+** Bug fixes
+
+  "vc-dwim a/ChangeLog b/ChangeLog" would mistakenly complain about
+  an "--author/ChangeLog mismatch" even though the two name/email
+  pairs in the ChangeLog files were identical.
+

 * Noteworthy changes in release 1.5 (2011-05-20) [stable]

diff --git a/vc-dwim.pl b/vc-dwim.pl
index abe65ce..e474efc 100755
--- a/vc-dwim.pl
+++ b/vc-dwim.pl
@@ -678,6 +678,7 @@ sub check_attribution($$)
       return;
     }

+  $$author =~ s/  +</ </;
   $$author eq $name_and_email
     or die "$ME: --author/ChangeLog mismatch:\n  $$author\n  
$name_and_email\n";
 }
--
1.7.5.2.660.g9f46c



reply via email to

[Prev in Thread] Current Thread [Next in Thread]