X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit;h=5e9d7114bd3b143c40d76aec609c0b3c52ad4923;hp=42813f1f8f026c00ef79e463a4fda1401e18a822;hb=b9ef2453ea950bd60ddb52e2253cdf762f34534d;hpb=7ade597c2d0bd7f63eff7f36448c3d705cfee73a

diff --git a/dgit b/dgit
index 42813f1f..5e9d7114 100755
--- a/dgit
+++ b/dgit
@@ -311,7 +311,7 @@ sub branch_is_gdr_unstitched_ff ($$$) {
     my ($symref, $head, $ancestor) = @_;
     my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $head);
     return 0 unless $ffq_prev;
-    return 0 unless is_fast_fwd $ancestor, $ffq_prev;
+    return 0 unless !defined $ancestor or is_fast_fwd $ancestor, $ffq_prev;
     return 1;
 }
 
@@ -4235,6 +4235,15 @@ END
     my $actualhead = git_rev_parse('HEAD');
 
     if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
+	if (quiltmode_splitbrain()) {
+	    my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
+	    fail <<END;
+Branch is managed by git-debrebase ($ffq_prev
+exists), but quilt mode ($quilt_mode) implies a split view.
+Pass the right --quilt option or adjust your git config.
+Or, maybe, run git-debrebase forget-was-ever-debrebase.
+END
+	}
 	runcmd_ordryrun_local @git_debrebase, 'stitch';
 	$actualhead = git_rev_parse('HEAD');
     }
@@ -4476,9 +4485,8 @@ END
     supplementary_message(<<'END');
 Push failed, while obtaining signatures on the .changes and .dsc.
 If it was just that the signature failed, you may try again by using
-debsign by hand to sign the changes
-   $changesfile
-and then dput to complete the upload.
+debsign by hand to sign the changes file (see the command dgit tried,
+above), and then dput that changes file to complete the upload.
 If you need to change the package, you must use a new version number.
 END
     if ($we_are_responder) {
@@ -5368,13 +5376,20 @@ sub quiltify ($$$$) {
 	};
 	if ($quilt_mode eq 'linear') {
 	    print STDERR "\n$us: error: quilt fixup cannot be linear.  Stopped at:\n";
+	    my $all_gdr = !!@nots;
 	    foreach my $notp (@nots) {
 		print STDERR "$us:  ", $reportnot->($notp), "\n";
+		$all_gdr &&= $notp->{Child} &&
+		    (git_cat_file $notp->{Child}{Commit}, 'commit')
+		    =~ m{^\[git-debrebase.*\]$}m;
 	    }
-	    print STDERR "$us: $_\n" foreach @$failsuggestion;
+	    print STDERR "\n";
+	    $failsuggestion =
+		[ grep { $_->[0] ne 'quilt-mode' } @$failsuggestion ]
+		if $all_gdr;
+	    print STDERR "$us: $_->[1]\n" foreach @$failsuggestion;
 	    fail
- "quilt history linearisation failed.  Search \`quilt fixup' in dgit(7).\n".
- "Use dpkg-source --commit by hand; or, --quilt=smash for one ugly patch";
+ "quilt history linearisation failed.  Search \`quilt fixup' in dgit(7).\n";
 	} elsif ($quilt_mode eq 'smash') {
 	} elsif ($quilt_mode eq 'auto') {
 	    progress "quilt fixup cannot be linear, smashing...";
@@ -5915,12 +5930,21 @@ END
 
     my @failsuggestion;
     if (!($diffbits->{O2H} & $diffbits->{O2A})) {
-        push @failsuggestion, "This might be a patches-unapplied branch.";
+        push @failsuggestion, [ 'unapplied',
+			       "This might be a patches-unapplied branch." ];
     } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
-        push @failsuggestion, "This might be a patches-applied branch.";
+        push @failsuggestion, [ 'applied',
+				"This might be a patches-applied branch." ];
     }
-    push @failsuggestion, "Maybe you need to specify one of".
-        " --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?";
+    push @failsuggestion, [ 'quilt-mode',
+ "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?" ];
+
+    push @failsuggestion, [ 'gitattrs',
+ "Warning: Tree has .gitattributes.  See GITATTRIBUTES in dgit(7)." ]
+	if stat_exists '.gitattributes';
+
+    push @failsuggestion, [ 'origs',
+ "Maybe orig tarball(s) are not identical to git representation?" ];
 
     if (quiltmode_splitbrain()) {
 	quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,