threads / patch / 45060

patchworktree: fix option descriptions for `prune`

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

## tl;dr

3 messages between Feb 6, 2017 and Feb 7, 2017. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Patrick Steinhardt· Feb 6, 2017, 13:13 UTC · lore

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(-)
Show changes to builtin/worktree.c +2 −2
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
Junio C Hamano· Feb 6, 2017, 18:59 UTC · re: Patrick Steinhardt · lore

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

Patrick Steinhardt <patrick.steinhardt@elego.de> writes:
Show 7 quoted lines
>  	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.
Duy Nguyen· Feb 7, 2017, 11:11 UTC · re: Junio C Hamano · lore

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

On Tue, Feb 7, 2017 at 1:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 11 quoted lines
> 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

← back to recent threads