git-debrebase: merge: Add a comment about rewriting

[dgit.git] / git-debrebase

diff --git a/git-debrebase b/git-debrebase
index bc725fa3c802679f51a98395fcec625158cb0351..5de9c14b74f63e42d5628ab355febb89ace3a182 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1217,14 +1217,14 @@ sub walk ($;$$$) {
            }
 
            if ($ok && $might_be_in_bw) {
+               # We could rewrite this to contaion the metadata
+               # declaring it to be MergedBreakwaters, but
+               # unnecessarily rewriting a merge seems unhelpful.
                $prline->(" VanillaMerge MergedBreakwaters");
                $last_anchor = $best_anchor;
                $build_start->('MergedBreakwaters', $cur);
            }
 
-           $nomerge->("alleged merged-breakwater is not a breakwater")
-               unless $ty eq 'VanillaMerge';
-
            my $bwb = cmdoutput @bwbcmd;
 
            # OK, now we have a breakwater base, but we need the merge