[PATCH] worktree: fix option descriptions for `prune`

[PATCH] worktree: fix option descriptions for `prune`

[Patrick Steinhardt]

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

Re: [PATCH] worktree: fix option descriptions for `prune`

[Junio C Hamano]

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.

Re: [PATCH] worktree: fix option descriptions for `prune`

[Duy Nguyen]

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