* [PATCH] worktree: fix option descriptions for `prune`
@ 2017-02-06 13:13 Patrick Steinhardt
2017-02-06 18:59 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Patrick Steinhardt @ 2017-02-06 13:13 UTC (permalink / raw)
To: git; +Cc: Patrick Steinhardt, Nguyễn Thái Ngọc Duy, ps
The `verbose` and `expire` options of the `git worktree prune`
subcommand have wrong descriptions in that they pretend to relate to
objects. But as the git-worktree(1) correctly states, these options have
nothing to do with objects but only with worktrees. Fix the description
accordingly.
Signed-off-by: Patrick Steinhardt <patrick.steinhardt@elego.de>
---
builtin/worktree.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 9a97e37a3..831fe058a 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -125,9 +125,9 @@ static int prune(int ac, const char **av, const char *prefix)
{
struct option options[] = {
OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
- OPT__VERBOSE(&verbose, N_("report pruned objects")),
+ OPT__VERBOSE(&verbose, N_("report pruned working trees")),
OPT_EXPIRY_DATE(0, "expire", &expire,
- N_("expire objects older than <time>")),
+ N_("expire working trees older than <time>")),
OPT_END()
};
--
2.11.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] worktree: fix option descriptions for `prune`
2017-02-06 13:13 [PATCH] worktree: fix option descriptions for `prune` Patrick Steinhardt
@ 2017-02-06 18:59 ` Junio C Hamano
2017-02-07 11:11 ` Duy Nguyen
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2017-02-06 18:59 UTC (permalink / raw)
To: Patrick Steinhardt; +Cc: git, Nguyễn Thái Ngọc Duy, ps
Patrick Steinhardt <patrick.steinhardt@elego.de> writes:
> struct option options[] = {
> OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
> - OPT__VERBOSE(&verbose, N_("report pruned objects")),
> + OPT__VERBOSE(&verbose, N_("report pruned working trees")),
> OPT_EXPIRY_DATE(0, "expire", &expire,
> - N_("expire objects older than <time>")),
> + N_("expire working trees older than <time>")),
Thanks for sharp eyes.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] worktree: fix option descriptions for `prune`
2017-02-06 18:59 ` Junio C Hamano
@ 2017-02-07 11:11 ` Duy Nguyen
0 siblings, 0 replies; 3+ messages in thread
From: Duy Nguyen @ 2017-02-07 11:11 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Patrick Steinhardt, Git Mailing List, Patrick Steinhardt
On Tue, Feb 7, 2017 at 1:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Patrick Steinhardt <patrick.steinhardt@elego.de> writes:
>
>> struct option options[] = {
>> OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
>> - OPT__VERBOSE(&verbose, N_("report pruned objects")),
>> + OPT__VERBOSE(&verbose, N_("report pruned working trees")),
>> OPT_EXPIRY_DATE(0, "expire", &expire,
>> - N_("expire objects older than <time>")),
>> + N_("expire working trees older than <time>")),
>
> Thanks for sharp eyes.
Yep.
This message never made it to git@vger right, because I didn't see it?
Oh no, gmail classified the original mail as spam again...
--
Duy
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-02-07 11:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-06 13:13 [PATCH] worktree: fix option descriptions for `prune` Patrick Steinhardt
2017-02-06 18:59 ` Junio C Hamano
2017-02-07 11:11 ` Duy Nguyen
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).