git-debrebase: stitch: check the branch is laundered

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index f79aef5ff2241478bb98e452fe134d30492208a1..01eb0eb0e95c349fc0f96553286be7e3f9f031d6 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -1211,9 +1211,12 @@ sub cmd_stitch () {
     if (!$prev) {
        fail "No ffq-prev to stitch." unless $opt_noop_ok;
     }
+    my $old_head = get_head();
+
+    breakwater_of $old_head, 'unclean-stitch';
+
     push @deferred_updates, "delete $ffq_prev $prev";
 
-    my $old_head = get_head();
     if (is_fast_fwd $old_head, $prev) {
        my $differs = get_differs $old_head, $prev;
        unless ($differs & ~D_PAT_ADD) {

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 9ddf9390b40781b2aad7724c5c29685aadfe7c58..044d13651c8b1f8a954cdcb54c8c9e88ec64f6fa 100644 (file)
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -56,6 +56,8 @@ consuming ffq-prev.
 
 If there is no ffq-prev, it is an error, unless --noop-ok.
 
+It is a problem if the branch is not laundered.
+
 =item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...]
 
 Rebases the delta queue