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

diff --git a/dgit b/dgit
index 6879e541..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) {
@@ -5228,29 +5236,7 @@ END
     my $dgitview = git_rev_parse 'HEAD';
 
     changedir $maindir;
-    # When we no longer need to support squeeze, use --create-reflog
-    # instead of this:
-    ensuredir "$maindir_gitcommon/logs/refs/dgit-intern";
-    my $makelogfh = new IO::File "$maindir_gitcommon/logs/refs/$splitbraincache", '>>'
-      or die $!;
-
-    my $oldcache = git_get_ref "refs/$splitbraincache";
-    if ($oldcache eq $dgitview) {
-	my $tree = cmdoutput qw(git rev-parse), "$dgitview:";
-	# git update-ref doesn't always update, in this case.  *sigh*
-	my $dummy = make_commit_text <<END;
-tree $tree
-parent $dgitview
-author Dgit <dgit\@example.com> 1000000000 +0000
-committer Dgit <dgit\@example.com> 1000000000 +0000
-
-Dummy commit - do not use
-END
-	runcmd @git, qw(update-ref -m), "dgit $our_version - dummy",
-	    "refs/$splitbraincache", $dummy;
-    }
-    runcmd @git, qw(update-ref -m), $cachekey, "refs/$splitbraincache",
-	$dgitview;
+    reflog_cache_insert "refs/$splitbraincache", $cachekey, $dgitview;
 
     changedir "$playground/work";
 
@@ -5390,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...";
@@ -5753,26 +5746,12 @@ sub quilt_check_splitbrain_cache ($$) {
     push @cachekey, $srcshash->hexdigest();
     $splitbrain_cachekey = "@cachekey";
 
-    my @cmd = (@git, qw(log -g), '--pretty=format:%H %gs',
-	       $splitbraincache);
     printdebug "splitbrain cachekey $splitbrain_cachekey\n";
-    debugcmd "|(probably)",@cmd;
-    my $child = open GC, "-|";  defined $child or die $!;
-    if (!$child) {
-	chdir $maindir or die $!;
-	if (!stat "$maindir_gitcommon/logs/refs/$splitbraincache") {
-	    $! == ENOENT or die $!;
-	    printdebug ">(no reflog)\n";
-	    finish 0;
-	}
-	exec @cmd; die $!;
-    }
-    while (<GC>) {
-	chomp;
-	printdebug ">| ", $_, "\n" if $debuglevel > 1;
-	next unless m/^(\w+) (\S.*\S)$/ && $2 eq $splitbrain_cachekey;
-	    
-	my $cachehit = $1;
+
+    my $cachehit = reflog_cache_lookup
+	"refs/$splitbraincache", $splitbrain_cachekey;
+
+    if ($cachehit) {
 	unpack_playtree_mkwork($headref);
 	my $saved = maybe_split_brain_save $headref, $cachehit, "cache-hit";
 	if ($cachehit ne $headref) {
@@ -5784,8 +5763,6 @@ sub quilt_check_splitbrain_cache ($$) {
 	progress "dgit view: found cached, no changes required";
 	return ($headref, $splitbrain_cachekey);
     }
-    die $! if GC->error;
-    failedcmd unless close GC;
 
     printdebug "splitbrain cache miss\n";
     return (undef, $splitbrain_cachekey);
@@ -5953,12 +5930,21 @@ END
 
     my @failsuggestion;
     if (!($diffbits->{O2H} & $diffbits->{O2A})) {
-        push @failsuggestion, "This might be a patches-unapplied branch.";
-    }  elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
-        push @failsuggestion, "This might be a patches-applied branch.";
+        push @failsuggestion, [ 'unapplied',
+			       "This might be a patches-unapplied branch." ];
+    } elsif (!($diffbits->{H2A} & $diffbits->{O2A})) {
+        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,