summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
Diffstat (limited to 'git-debrebase')
-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