chiark / gitweb /
git-debrebase: stitch: check the branch is laundered
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 25 Mar 2018 11:55:07 +0000 (12:55 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:07:00 +0000 (16:07 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
git-debrebase.1.pod

index f79aef5..01eb0eb 100755 (executable)
@@ -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) {
index 9ddf939..044d136 100644 (file)
@@ -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