chiark / gitweb /
git-debrebase: slight message improvements etc.
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 16 Feb 2018 22:44:13 +0000 (22:44 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:03:11 +0000 (16:03 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index acf4c85..5adbb8f 100755 (executable)
@@ -32,8 +32,7 @@
 #    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:
 #
@@ -1164,7 +1163,8 @@ END
 }
 
 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;
@@ -1210,9 +1210,9 @@ sub cmd_convert_from_gbp () {
        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