git-debrebase: Fix a message to use "" properly

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index 46ea06af925394634e08eab9a16af02e215709fa..e3fea7c84a1d2824c23fd933fdb2a7c3ab1e9ebe 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -560,7 +560,7 @@ sub keycommits ($;$$$) {
            $breakwater = undef;
        } elsif ($ty eq 'Mixed') {
            $x->($unclean, 'mixed',
-                'found mixed upstream/packaging commit ($head)');
+                "found mixed upstream/packaging commit ($head)");
            $clogonly = undef;
            $breakwater = undef;
        } elsif ($ty eq 'Pseudomerge' or
@@ -1083,8 +1083,8 @@ sub stitch ($$$$$) {
     update_head $old_head, $new_head, "stitch: $prose";
 }
 
-sub do_stitch ($) {
-    my ($prose) = @_;
+sub do_stitch ($;$) {
+    my ($prose, $unclean) = @_;
 
     my ($ffq_prev, $gdrlast, $ffq_prev_commitish) = ffq_prev_info();
     if (!$ffq_prev_commitish) {
@@ -1093,7 +1093,7 @@ sub do_stitch ($) {
     }
     my $dangling_head = get_head();
 
-    keycommits $dangling_head, \&snag, \&snag, \&snag;
+    keycommits $dangling_head, $unclean,$unclean,$unclean;
 
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
@@ -1316,14 +1316,14 @@ sub cmd_stitch () {
     my $prose = 'stitch';
     GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
     badusage "no arguments allowed" if @ARGV;
-    do_stitch($prose);
+    do_stitch $prose, 0;
 }
 sub cmd_prepush () { cmd_stitch(); }
 
 sub cmd_quick () {
     badusage "no arguments allowed" if @ARGV;
     do_launder_head 'launder for git-debrebase quick';
-    do_stitch 'quick';
+    do_stitch 'quick', \&snag;
 }
 
 sub cmd_conclude () {
@@ -1336,7 +1336,7 @@ sub cmd_conclude () {
     
     badusage "no arguments allowed" if @ARGV;
     do_launder_head 'launder for git-debrebase quick';
-    do_stitch 'quick';
+    do_stitch 'quick', \&snag;
 }
 
 sub cmd_convert_from_gbp () {