Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
# git-debrebase [<options>] stitch [--prose=<for commit message>]
# git-debrebase [<options>] downstream-rebase-launder-v0 # experimental
#
# git-debrebase [<options>] stitch [--prose=<for commit message>]
# git-debrebase [<options>] downstream-rebase-launder-v0 # experimental
#
-# git-debrebase [<options>] convert-from-gbp \
-# <upstream>
+# git-debrebase [<options>] convert-from-gbp <upstream-git-rev>
# problems / outstanding questions:
#
# problems / outstanding questions:
#
}
sub cmd_convert_from_gbp () {
}
sub cmd_convert_from_gbp () {
- badusage "needs 1 optional argument, the upstream" unless @ARGV<=1;
+ badusage "needs 1 optional argument, the upstream git rev"
+ unless @ARGV<=1;
my ($upstream_spec) = @ARGV;
$upstream_spec //= 'refs/heads/upstream';
my $upstream = git_rev_parse $upstream_spec;
my ($upstream_spec) = @ARGV;
$upstream_spec //= 'refs/heads/upstream';
my $upstream = git_rev_parse $upstream_spec;
runcmd @git, qw(checkout -q gdr-internal~0);
rm_subdir_cached 'debian/patches';
$work = make_commit ['HEAD'], [
runcmd @git, qw(checkout -q gdr-internal~0);
rm_subdir_cached 'debian/patches';
$work = make_commit ['HEAD'], [
- 'git-debrebase convert-from-gbp: drop patch queue',
+ 'git-debrebase convert-from-gbp: drop patches from tree',
'Delete debian/patches, as part of converting to git-debrebase format.',
'Delete debian/patches, as part of converting to git-debrebase format.',
- '[git-debrebase convert-from-gbp: drop patches]'
+ '[git-debrebase convert-from-gbp: drop patches from tree]'
];
# make the breakwater pseudomerge
# the tree is already exactly right
];
# make the breakwater pseudomerge
# the tree is already exactly right