summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-04-22 23:23:15 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 22:40:13 +0100
commitb33a6ea64a28a1122d75ce3a0d4808211e0734d3 (patch)
treec00deb1e923b715bac44c1ec9f05a522d590ca82
parent8ce880e160f707bcf241f0e07a12614f624be96e (diff)
git-debrebase: Add a several missing snags_maybe_bail calls
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>
-rwxr-xr-xgit-debrebase3
1 files changed, 3 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index e3fea7c..6259dfe 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -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