chiark / gitweb /
git-debrebase: Add a several missing snags_maybe_bail calls
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 22 Apr 2018 22:23:15 +0000 (23:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 21:40:13 +0000 (22:40 +0100)
That these were missing is a bit alarming.  I am about to add some
more defences against missing this check.

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

index e3fea7c84a1d2824c23fd933fdb2a7c3ab1e9ebe..6259dfe8076bf83b0dab5b00973b28529e1a2afd 100755 (executable)
@@ -901,6 +901,7 @@ sub do_launder_head ($) {
     my $old = get_head();
     record_ffq_auto();
     my ($tip,$breakwater) = walk $old;
+    snags_maybe_bail();
     update_head_postlaunder $old, $tip, $reflogmsg;
     return ($tip,$breakwater);
 }
@@ -1094,6 +1095,7 @@ sub do_stitch ($;$) {
     my $dangling_head = get_head();
 
     keycommits $dangling_head, $unclean,$unclean,$unclean;
+    snags_maybe_bail();
 
     stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose);
 }
@@ -1429,6 +1431,7 @@ sub cmd_convert_to_gbp () {
        push @deferred_updates, "delete $ffq";
        push @deferred_updates, "delete $gdrlast";
     }
+    snags_maybe_bail();
     update_head_checkout $head, $out, "convert to gbp (v0)";
     print <<END or die $!;
 git-debrebase: converted to git-buildpackage branch format