X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=35b75cd67ea2bc6de01e68a3621dc919efe96ce2;hp=6d51a90ba7c1cd50c7d6d3062a823acb76d24732;hb=2bfdf4a69e6ae3ce6b94f0d1ac13b1cde8b5a5c6;hpb=0d821f5b266626e266c59522017f6d9e714d89c3

diff --git a/git-debrebase b/git-debrebase
index 6d51a90b..35b75cd6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -395,10 +395,8 @@ sub merge_series ($$;@) {
 	foreach my $q ($base_q, reverse @input_qs) {
 	    my $s = $q->{MR}{S};
 	    gbp_pq_export "p-$s", $q->{SeriesBase}, $q->{SeriesTip};
-	    # xxx avoid trying to merge debian/ again here, by
-	    # always using debian/ from newbase
+	    my @earlier;
 	    if (open S, $seriesfile) {
-		my @earlier;
 		while (my $patch = <S>) {
 		    chomp $patch or die $!;
 		    $prereq{$patch} //= {};
@@ -426,6 +424,20 @@ sub merge_series ($$;@) {
                 "[git-debrebase merge-innards patch-queue prep:".
                 " $q->{SeriesTip}]"
             ];
+
+	    read_tree_debian $newbase;
+	    if (@earlier) {
+		read_tree_subdir 'debian/patches', "$pec:debian/patches";
+	    } else {
+		rm_subdir_cached 'debian/patches';
+	    }
+	    $pec = make_commit [ $pec ], [
+ "Update debian/ (excluding patches) to final to avoid re-merging",
+ "debian/ was already merged and we need to just take that.",
+                "[git-debrebase merge-innards patch-queue packaging:".
+                " $q->{SeriesTip}]"
+            ];
+
 	    printdebug "pec' $pec\n";
             runcmd @git, qw(reset -q --hard), $pec;
 	    $q->{MR}{PEC} = $pec;
@@ -1118,7 +1130,11 @@ sub walk ($;$$$) {
 		return $bomb->();
 	    }
 	    die "$ty ?";
-	} elsif ($ty eq 'VanillaMerge' or $ty eq 'MergedBreakwaters') {
+	} elsif ($ty eq 'MergedBreakwaters') {
+	    $last_anchor = mergedbreakwaters_anchor $cl;
+	    $build_start->(' MergedBreakwaters', $cur);
+	    last;
+	} elsif ($ty eq 'VanillaMerge') {
 	    # User may have merged unstitched branch(es).  We will
 	    # have now lost what ffq-prev was then (since the later
 	    # pseudomerge may introduce further changes).  The effect
@@ -1154,9 +1170,6 @@ sub walk ($;$$$) {
 
 	    printdebug "*** MERGE\n";
 
-	    # xxx avoid calling walk without nogenerate when
-	    # we have a MergedBreakwater; instead call keycommits ?
-
 	    my @bwbcmd = (@git, qw(merge-base));
 	    my @ibcmd = (@git, qw(merge-base --all));
 	    my $might_be_in_bw = 1;