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(1): Warn against plain git rebase.
[dgit.git]
/
git-debrebase
diff --git
a/git-debrebase
b/git-debrebase
index 5d3c7426da687046ae3dccabc134cab99f484458..13ca472d47881b34361a8c4dc160bc0113d0f47c 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-45,10
+45,16
@@
$|=1;
sub badusage ($) {
my ($m) = @_;
sub badusage ($) {
my ($m) = @_;
- print STDERR "bad usage: $m\n";
+ print STDERR "
$us:
bad usage: $m\n";
finish 8;
}
finish 8;
}
+sub getoptions {
+ my $m = shift;
+ local $SIG{__WARN__}; # GetOptions calls `warn' to print messages
+ GetOptions @_ or badusage $m;
+}
+
sub cfg ($;$) {
my ($k, $optional) = @_;
local $/ = "\0";
sub cfg ($;$) {
my ($k, $optional) = @_;
local $/ = "\0";
@@
-1518,7
+1524,8
@@
sub cmd_status () {
sub cmd_stitch () {
my $prose = 'stitch';
sub cmd_stitch () {
my $prose = 'stitch';
- GetOptions('prose=s', \$prose) or badusage("bad options to stitch");
+ getoptions("bad options follow \`git-debrebase stitch'",
+ 'prose=s', \$prose);
badusage "no arguments allowed" if @ARGV;
do_stitch $prose, 0;
}
badusage "no arguments allowed" if @ARGV;
do_stitch $prose, 0;
}
@@
-1581,8
+1588,8
@@
sub make_patches ($) {
sub cmd_make_patches () {
my $opt_quiet_would_amend;
sub cmd_make_patches () {
my $opt_quiet_would_amend;
- GetOptions('quiet-would-amend!', \$opt_quiet_would_amend)
-
or badusage("bad options to make-patches"
);
+ getoptions("bad options follow \`git-debrebase make-patches'",
+
'quiet-would-amend!', \$opt_quiet_would_amend
);
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;
@@
-1604,19
+1611,30
@@
sub cmd_make_patches () {
}
sub cmd_convert_from_gbp () {
}
sub cmd_convert_from_gbp () {
- badusage "
needs 1 optional argument, the upstream git rev
"
+ badusage "
want only 1 optional argument, the upstream git commitish
"
unless @ARGV<=1;
unless @ARGV<=1;
+
+ my $clogp = parsechangelog();
+ my $version = $clogp->{'Version'}
+ // die "missing Version from changelog";
+
my ($upstream_spec) = @ARGV;
my ($upstream_spec) = @ARGV;
- $upstream_spec //= 'refs/heads/upstream';
- my $upstream = git_rev_parse $upstream_spec;
+
+ my ($upstream, $upstream_version) =
+ resolve_upstream_version($upstream_spec, $version);
+
my $old_head = get_head();
my $upsdiff = get_differs $upstream, $old_head;
if ($upsdiff & D_UPS) {
my $old_head = get_head();
my $upsdiff = get_differs $upstream, $old_head;
if ($upsdiff & D_UPS) {
- runcmd @git, qw(--no-pager diff),
+ runcmd @git, qw(--no-pager diff
--stat
),
$upstream, $old_head,
qw( -- :!/debian :/);
$upstream, $old_head,
qw( -- :!/debian :/);
- fail "upstream ($upstream_spec) and HEAD are not identical in upstream files";
+ fail <<END;
+upstream ($upstream_spec) and HEAD are not
+identical in upstream files. See diffstat above, or run
+ git diff $upstream_spec HEAD -- :!/debian :/
+END
}
if (!is_fast_fwd $upstream, $old_head) {
}
if (!is_fast_fwd $upstream, $old_head) {
@@
-1791,7
+1809,8
@@
sub cmd_downstream_rebase_launder_v0 () {
}
}
}
}
-GetOptions("D+" => \$debuglevel,
+getoptions("bad options\n",
+ "D+" => \$debuglevel,
'noop-ok', => \$opt_noop_ok,
'f=s' => \@snag_force_opts,
'anchor=s' => \@opt_anchors,
'noop-ok', => \$opt_noop_ok,
'f=s' => \@snag_force_opts,
'anchor=s' => \@opt_anchors,
@@
-1807,7
+1826,8
@@
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 badusage "bad options\n";
+ });
+
initdebug('git-debrebase ');
enabledebug if $debuglevel;
initdebug('git-debrebase ');
enabledebug if $debuglevel;