diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-16 22:43:45 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:03:11 +0100 |
| commit | d980524cd66e12eda58f9df6bc8410454febd3aa (patch) | |
| tree | 28d4bdc5ce2c3d019ce91bf8d979df74438578c9 /git-debrebase | |
| parent | 4cffe29436a86c6aa974db00201cabae1448e0c7 (diff) | |
git-debrebase: rename gbp2gdr to convert-from-gbp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
| -rwxr-xr-x | git-debrebase | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-debrebase b/git-debrebase index 8253cb7..acf4c85 100755 --- a/git-debrebase +++ b/git-debrebase @@ -32,7 +32,7 @@ # git-debrebase [<options>] stitch [--prose=<for commit message>] # git-debrebase [<options>] downstream-rebase-launder-v0 # experimental # -# git-debrebase [<options>] gbp2debrebase-v0 \ +# git-debrebase [<options>] convert-from-gbp \ # <upstream> # problems / outstanding questions: @@ -1163,7 +1163,7 @@ END close U or failedcmd @upd_cmd; } -sub cmd_gbp2debrebase () { +sub cmd_convert_from_gbp () { badusage "needs 1 optional argument, the upstream" unless @ARGV<=1; my ($upstream_spec) = @ARGV; $upstream_spec //= 'refs/heads/upstream'; @@ -1210,9 +1210,9 @@ sub cmd_gbp2debrebase () { runcmd @git, qw(checkout -q gdr-internal~0); rm_subdir_cached 'debian/patches'; $work = make_commit ['HEAD'], [ - 'git-debrebase import: drop patch queue', + 'git-debrebase convert-from-gbp: drop patch queue', 'Delete debian/patches, as part of converting to git-debrebase format.', - '[git-debrebase: gbp2debrebase, drop patches]' + '[git-debrebase convert-from-gbp: drop patches]' ]; # make the breakwater pseudomerge # the tree is already exactly right @@ -1228,7 +1228,7 @@ sub cmd_gbp2debrebase () { $work = git_rev_parse 'HEAD'; }; - update_head_checkout $old_head, $work, 'gbp2debrebase'; + update_head_checkout $old_head, $work, 'convert-from-gbp'; } sub cmd_downstream_rebase_launder_v0 () { |