summaryrefslogtreecommitdiff
path: root/git-debrebase
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-11-11 22:51:47 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-11-11 23:01:06 +0000
commitdb1e66b54e45c0bbed8bb3eccadfc96271a4951f (patch)
tree9b3fb0f4ad2c2f334dfaa6adee668e17bbc21d5a /git-debrebase
parent1effab24bd9dc7eeb598394398fc88c630ae68dd (diff)
git-debrebase: conversion: bail a little earlier on snags
This avoids printing more messages that aren't going to be very helpful. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-xgit-debrebase1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-debrebase b/git-debrebase
index 4859efd..cafe83b 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -2463,6 +2463,7 @@ sub begin_convert_from () {
sub complete_convert_from ($$$$) {
my ($old_head, $new_head, $gi, $mrest) = @_;
+ snags_maybe_bail();
ffq_check $new_head;
record_gdrlast $gi->{LastRef}, $new_head, $gi->{LastObj}
if $gi->{LastRef};