Author: adam-guest
Date: 2008-04-10 08:10:54 +0000 (Thu, 10 Apr 2008)
New Revision: 1326
Modified:
trunk/debian/changelog
trunk/scripts/debcommit.pl
Log:
* debcommit: Modify the "strip message" functionality so that:
- Changelog lines beginning with any of *, + or - are considered to
indicate a "change" for the purposes of deciding whether to strip
the message
- When trimming leading whitespace on continuation lines, only spaces
and tabs are considered rather than line breaks (Closes: #475337)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-04-09 17:40:02 UTC (rev 1325)
+++ trunk/debian/changelog 2008-04-10 08:10:54 UTC (rev 1326)
@@ -1,6 +1,11 @@
devscripts (2.10.26) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * debcommit: Modify the "strip message" functionality so that:
+ - Changelog lines beginning with any of *, + or - are considered to
+ indicate a "change" for the purposes of deciding whether to strip
+ the message
+ - When trimming leading whitespace on continuation lines, only spaces
+ and tabs are considered rather than line breaks (Closes: #475337)
-- Adam D. Barratt <[EMAIL PROTECTED]> Wed, 09 Apr 2008 18:39:33 +0100
Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl 2008-04-09 17:40:02 UTC (rev 1325)
+++ trunk/scripts/debcommit.pl 2008-04-10 08:10:54 UTC (rev 1326)
@@ -85,7 +85,7 @@
the message.
This option is set by default and ignored if more than one line of
-the message begins with "* ".
+the message begins with "[*+-] ".
=item B<--sign-tags>, B<--no-sign-tags>
@@ -640,10 +640,10 @@
}
if ($stripmessage or $prog eq 'git') {
- my $count = () = $ret =~ /^\* /mg;
+ my $count = () = $ret =~ /^[ \t]*[\*\+-] /mg;
if ($count == 1) {
- $ret =~ s/^\* //;
- $ret =~ s/^\s+//mg;
+ $ret =~ s/^[ \t]*[\*\+-] //;
+ $ret =~ s/^[ \t]*//mg;
}
}
}
--
To unsubscribe, send mail to [EMAIL PROTECTED]
