X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase;h=a19d258b48b5b0a1896bf59d96221b83aa828430;hb=a34b15e438239ae5bc2df28d2f532f764b6d28d5;hp=66167b2bafd501671885cbb7db43984d200d6aa5;hpb=6152f859fc4fa61b485362a6ff5613f436883db8;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 66167b2b..a19d258b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2477,19 +2477,23 @@ END
 	my $mtag = cmdoutput @git, qw(describe --always --abbrev=0 --match),
 	    $mtag_pat;
 	die "could not find suitable maintainer view tag $mtag_pat\n"
-	    unless $mtag_pat =~ m{/};
+	    unless $mtag =~ m{/};
 	is_fast_fwd $mtag, 'HEAD' or
 	    die "HEAD is not FF from maintainer tag $mtag!";
 	my $dtag = "archive/$mtag";
 	is_fast_fwd $mtag, $dtag or
-	    die "dgit view tag $dtag is not FF from maintainer tag $mtag";
+	    die "dgit view tag $dtag is not FF from maintainer tag $mtag\n";
 	print "will stitch in dgit view, $dtag\n";
 	git_rev_parse $dtag;
     };
     if (!$previous_dgit_view) {
 	$@ =~ s/^\n+//;
 	chomp $@;
-	print STDERR "cannot stitch in dgit view: $@\n";
+	print STDERR <<END;
+Cannot confirm dgit view: $@
+Failed to stitch in dgit view (see messages above).
+dgit --overwrite will be needed on the first dgit push after conversion.
+END
     }
 
     snags_maybe_bail_early();
@@ -2533,6 +2537,9 @@ END
     ffq_check $work;
     snags_maybe_bail();
     update_head_checkout $old_head, $work, 'convert-from-gbp';
+    print <<END or die $!;
+git-debrebase: converted from patched-unapplied (gbp) branch format, OK
+END
 }
 
 sub cmd_convert_to_gbp () {