chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-maint-gbp(7): discuss dgit.default.build-products-dir
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 7b2e4f311dfbdf64813d14cb2bac92184837a6ff..07e5f478cac58281570da99ef27e57953c0a6a53 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-970,7
+970,8
@@
sub defaultcmd_rebase () {
}
sub cmd_analyse () {
}
sub cmd_analyse () {
- die if ($ARGV[0]//'') =~ m/^-/;
+ badusage "analyse does not support any options"
+ if @ARGV and $ARGV[0] =~ m/^-/;
badusage "too many arguments to analyse" if @ARGV>1;
my ($old) = @ARGV;
if (defined $old) {
badusage "too many arguments to analyse" if @ARGV>1;
my ($old) = @ARGV;
if (defined $old) {
@@
-1658,7
+1659,7
@@
sub cmd_convert_from_gbp () {
print STDERR "cannot stitch in dgit view: $@\n";
}
print STDERR "cannot stitch in dgit view: $@\n";
}
- snags_maybe_bail();
+ snags_maybe_bail
_early
();
my $work;
my $work;
@@
-1696,6
+1697,8
@@
sub cmd_convert_from_gbp () {
}
};
}
};
+ ffq_check $work;
+ snags_maybe_bail();
update_head_checkout $old_head, $work, 'convert-from-gbp';
}
update_head_checkout $old_head, $work, 'convert-from-gbp';
}