Author: adam-guest
Date: 2008-07-18 06:01:54 +0000 (Fri, 18 Jul 2008)
New Revision: 1575

Modified:
   trunk/debian/changelog
   trunk/scripts/debcommit.pl
Log:
debcommit: When --diff is used, don't open an editor to confirm commit
messages

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-07-15 21:46:53 UTC (rev 1574)
+++ trunk/debian/changelog      2008-07-18 06:01:54 UTC (rev 1575)
@@ -1,5 +1,7 @@
 devscripts (2.10.35) UNRELEASED; urgency=low
 
+  * debcommit: When --diff is used, don't open an editor to confirm commit
+    messages
   * po4a/po/fr.po: Update French manpage translations; thanks Nicolas FRANCOIS
     (Closes: #491001)
 

Modified: trunk/scripts/debcommit.pl
===================================================================
--- trunk/scripts/debcommit.pl  2008-07-15 21:46:53 UTC (rev 1574)
+++ trunk/scripts/debcommit.pl  2008-07-18 06:01:54 UTC (rev 1575)
@@ -615,7 +615,7 @@
            }
        } else {
 
-           if ($prog =~ /^(git|hg)$/) {
+           if ($prog =~ /^(git|hg)$/ and not $diffmode) {
                my $count = () = $ret =~ /^\s*[\*\+-] /mg;
 
                if ($count == 1) {



-- 
To unsubscribe, send mail to [EMAIL PROTECTED]

Reply via email to