diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 23:22:23 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-17 23:22:24 +0100 |
commit | 375a065009f11f786116a81d8d3a1edde32fe96b (patch) | |
tree | 5fcf59ee8b8721a4b9c05622757152cadaed3d6c | |
parent | e57c54ab8b45cefb6087295a7a5eb61a678e1188 (diff) |
git-debrebase: Rename new-upstream-v0 command to new-upstream
This UI is pretty good now, I think, for single-piece upstreams.
For multi-piece ones, which are quite tricky anyway, it is tolerable,
and we it doesn't steal much of the available syntax space. So we
don't need the -v0 any more.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r-- | NOTES.git-debrebase | 2 | ||||
-rw-r--r-- | dgit-maint-debrebase.7.pod | 2 | ||||
-rwxr-xr-x | git-debrebase | 2 | ||||
-rw-r--r-- | git-debrebase.1.pod | 7 | ||||
-rwxr-xr-x | tests/tests/gdr-newupstream-v0 | 6 |
5 files changed, 7 insertions, 12 deletions
diff --git a/NOTES.git-debrebase b/NOTES.git-debrebase index f32cf87..f87718b 100644 --- a/NOTES.git-debrebase +++ b/NOTES.git-debrebase @@ -40,7 +40,7 @@ workflow # * Workflow is currently clumsy. Lots of spurious runes to type. # There's not even a guide. # -# * new-upstream-v0 has a terrible UI for multiple upstream pieces. +# * new-upstream has an awkward UI for multiple upstream pieces. # You end up with giant runic command lines. Does this matter / # One consequence of the lack of richness it can need -f in # fairly sensible situations. diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 5ae921f..e492768 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -323,7 +323,7 @@ or if you have a working watch file =over 4 - % git debrebase new-upstream-v0 1.2.3 + % git debrebase new-upstream 1.2.3 =back diff --git a/git-debrebase b/git-debrebase index 216d7df..9e8d707 100755 --- a/git-debrebase +++ b/git-debrebase @@ -1129,7 +1129,7 @@ sub do_stitch ($;$) { stitch($dangling_head, $ffq_prev, $gdrlast, $ffq_prev_commitish, $prose); } -sub cmd_new_upstream_v0 () { +sub cmd_new_upstream () { # automatically and unconditionally launders before rebasing # if rebase --abort is used, laundering has still been done diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 6a98ed2..6168e14 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -100,7 +100,7 @@ If there is no ffq-prev, it is an error, unless --noop-ok. You should consider using B<conclude> instead, because that launders the branch too. -=item git-debrebase new-upstream-v0 <new-version> [<upstream-details>...] +=item git-debrebase new-upstream <new-version> [<upstream-details>...] Rebases the delta queue onto a new upstream version. In detail: @@ -199,11 +199,6 @@ L<git-deborig(1)>, L<git-archive(1)>, L<dgit(1)> and L<gbp-import-orig(1)> may be able to help. -This subcommand has -v0 in its name because we are not yet sure -that its command line syntax is optimal. -We may want to introduce an incompatible replacement syntax -under the name C<new-upstream>. - =item git-debrebase make-patches [--quiet-would-amend] Generate patches in debian/patches/ diff --git a/tests/tests/gdr-newupstream-v0 b/tests/tests/gdr-newupstream-v0 index e866edc..536f49c 100755 --- a/tests/tests/gdr-newupstream-v0 +++ b/tests/tests/gdr-newupstream-v0 @@ -31,11 +31,11 @@ v=2.1-1 git checkout master t-expect-fail F:'Could not determine appropriate upstream commitish' \ -t-git-debrebase new-upstream-v0 $v +t-git-debrebase new-upstream $v git tag v2.1 upstream -t-git-debrebase new-upstream-v0 $v +t-git-debrebase new-upstream $v t-gdr-good laundered t-git-debrebase stitch @@ -54,7 +54,7 @@ anchor=$(perl <../anal.anch -ne ' exit; ') -t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream-v0 $v upstream +t-git-debrebase --anchor=$anchor -fanchor-treated new-upstream $v upstream t-gdr-good laundered t-git-debrebase stitch |