git-debrebase: merge: Comment about laundry of merge of unstitched

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index f8aa9d8f6c249fb75e22356c338f25efdb49d76f..34e40a3b0ab684327533e868de48e95f7d4d241e 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -159,8 +159,21 @@ sub enabledebuglevel ($) {
 }
     
 sub printdebug {
 }
     
 sub printdebug {

+    # Prints a prefix, and @_, to DEBUG.  @_ should normally contain
+    # a trailing \n.
+
+    # With no (or only empty) arguments just prints the prefix and
+    # leaves the caller to do more with DEBUG.  The caller should make
+    # sure then to call printdebug with something ending in "\n" to
+    # get the prefix right in subsequent calls.
+

     return unless $debuglevel >= $printdebug_when_debuglevel;
     return unless $debuglevel >= $printdebug_when_debuglevel;

-    print DEBUG $debugprefix, @_ or die $!;
+    our $printdebug_noprefix;
+    print DEBUG $debugprefix unless $printdebug_noprefix;
+    pop @_ while @_ and !length $_[-1];
+    return unless @_;
+    print DEBUG @_ or die $!;
+    $printdebug_noprefix = $_[-1] !~ m{\n$};

 }
 
 sub messagequote ($) {
 }
 
 sub messagequote ($) {