chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debrebase: Set $|
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index b029e5cff9d1789673d4be8cbb359b85da1043dc..fb6b79d92a905239f88b8bdeb0dd9c8c1a7f9424 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-41,6
+41,8
@@
our ($opt_defaultcmd_interactive);
our $us = qw(git-debrebase);
our $us = qw(git-debrebase);
+$|=1;
+
sub badusage ($) {
my ($m) = @_;
print STDERR "bad usage: $m\n";
sub badusage ($) {
my ($m) = @_;
print STDERR "bad usage: $m\n";
@@
-276,6
+278,11
@@
sub snags_maybe_bail () {
}
$snags_summarised = $snags_forced + $snags_tripped;
}
}
$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;
}
sub any_snags () {
return $snags_forced || $snags_tripped;
}
@@
-980,7
+987,7
@@
sub ffq_prev_branchinfo () {
return gdr_ffq_prev_branchinfo($current);
}
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
# calls $ff and/or $notff zero or more times
# then returns either (status,message) where status is
# exists
@@
-994,6
+1001,9
@@
sub ffq_check ($$$) {
# normally $currentval should be HEAD
my ($currentval, $ff, $notff) =@_;
# 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';
my ($status, $message, $current, $ffq_prev, $gdrlast)
= ffq_prev_branchinfo();
return ($status, $message) unless $status eq 'branch';
@@
-1073,8
+1083,7
@@
sub record_ffq_prev_deferred () {
# some messages about ff checks
my $currentval = get_head();
# 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();
return ($status,$message) if defined $status;
snags_maybe_bail();
@@
-1494,7
+1503,7
@@
sub cmd_status () {
sub cmd_stitch () {
my $prose = 'stitch';
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;
}
badusage "no arguments allowed" if @ARGV;
do_stitch $prose, 0;
}
@@
-1558,7
+1567,7
@@
sub make_patches ($) {
sub cmd_make_patches () {
my $opt_quiet_would_amend;
GetOptions('quiet-would-amend!', \$opt_quiet_would_amend)
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;
badusage "no arguments allowed" if @ARGV;
my $old_head = get_head();
my $new = make_patches $old_head;
@@
-1739,7
+1748,7
@@
GetOptions("D+" => \$debuglevel,
# approach. '-i=s{0,}' does not work with bundling.
push @$opt_defaultcmd_interactive, @ARGV;
@ARGV=();
# 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;
initdebug('git-debrebase ');
enabledebug if $debuglevel;