diff options
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 7b2e4f3..f002225 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1658,7 +1658,7 @@ sub cmd_convert_from_gbp () { print STDERR "cannot stitch in dgit view: $@\n"; } - snags_maybe_bail(); + snags_maybe_bail_early(); my $work; @@ -1696,6 +1696,8 @@ sub cmd_convert_from_gbp () { } }; + ffq_check $work; + snags_maybe_bail(); update_head_checkout $old_head, $work, 'convert-from-gbp'; } |