}
$snags_summarised = $snags_forced + $snags_tripped;
}
+sub snags_maybe_bail_early () {
+ # useful to bail out early without doing a lot of work;
+ # not a substitute for snags_maybe_bail.
+ snags_maybe_bail() if $snags_tripped && !$opt_force;
+}
sub any_snags () {
return $snags_forced || $snags_tripped;
}
return gdr_ffq_prev_branchinfo($current);
}
-sub ffq_check ($$$) {
+sub ffq_check ($;$$) {
# calls $ff and/or $notff zero or more times
# then returns either (status,message) where status is
# exists
# normally $currentval should be HEAD
my ($currentval, $ff, $notff) =@_;
+ $ff //= sub { print $_[0] or die $!; };
+ $notff //= \&snag;
+
my ($status, $message, $current, $ffq_prev, $gdrlast)
= ffq_prev_branchinfo();
return ($status, $message) unless $status eq 'branch';
# some messages about ff checks
my $currentval = get_head();
- my ($status,$message, $ffq_prev,$gdrlast) =
- ffq_check $currentval, sub { print $_[0] or die $!; }, \&snag;
+ my ($status,$message, $ffq_prev,$gdrlast) = ffq_check $currentval;
return ($status,$message) if defined $status;
snags_maybe_bail();
sub cmd_stitch () {
my $prose = 'stitch';
- GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
+ GetOptions('prose=s', \$prose) or badusage("bad options to stitch");
badusage "no arguments allowed" if @ARGV;
do_stitch $prose, 0;
}
sub cmd_make_patches () {
my $opt_quiet_would_amend;
GetOptions('quiet-would-amend!', \$opt_quiet_would_amend)
- or die badusage("bad options to make-patches");
+ or badusage("bad options to make-patches");
badusage "no arguments allowed" if @ARGV;
my $old_head = get_head();
my $new = make_patches $old_head;
# approach. '-i=s{0,}' does not work with bundling.
push @$opt_defaultcmd_interactive, @ARGV;
@ARGV=();
- }) or die badusage "bad options\n";
+ }) or badusage "bad options\n";
initdebug('git-debrebase ');
enabledebug if $debuglevel;