* [PATCH 1/1] doc: remove dangling closing parenthesis
@ 2024-07-22 22:53 Tomas Nordin
2024-07-22 22:59 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Tomas Nordin @ 2024-07-22 22:53 UTC (permalink / raw)
To: gitster; +Cc: git, charvi077, tomasn
The second line of the synopsis, starting with [--dry-run] has a
dangling closing paren in the second optional group. Probably added by
mistake, so remove it.
Signed-off-by: Tomas Nordin <tomasn@posteo.net>
---
Documentation/git-commit.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 89ecfc63a8..c822113c11 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
- [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
+ [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]
[-F <file> | -m <msg>] [--reset-author] [--allow-empty]
[--allow-empty-message] [--no-verify] [-e] [--author=<author>]
[--date=<date>] [--cleanup=<mode>] [--[no-]status]
--
2.39.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] doc: remove dangling closing parenthesis
2024-07-22 22:53 [PATCH 1/1] doc: remove dangling closing parenthesis Tomas Nordin
@ 2024-07-22 22:59 ` Junio C Hamano
2024-07-23 0:35 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2024-07-22 22:59 UTC (permalink / raw)
To: Tomas Nordin; +Cc: git, charvi077
Tomas Nordin <tomasn@posteo.net> writes:
> The second line of the synopsis, starting with [--dry-run] has a
> dangling closing paren in the second optional group. Probably added by
> mistake, so remove it.
>
> Signed-off-by: Tomas Nordin <tomasn@posteo.net>
> ---
> Documentation/git-commit.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
> index 89ecfc63a8..c822113c11 100644
> --- a/Documentation/git-commit.txt
> +++ b/Documentation/git-commit.txt
> @@ -9,7 +9,7 @@ SYNOPSIS
> --------
> [verse]
> 'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
> - [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
> + [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]
> [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
> [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
> [--date=<date>] [--cleanup=<mode>] [--[no-]status]
Wonderful. Thanks.
Will queue.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] doc: remove dangling closing parenthesis
2024-07-22 22:59 ` Junio C Hamano
@ 2024-07-23 0:35 ` Junio C Hamano
2024-07-23 8:50 ` Karthik Nayak
2024-07-23 11:44 ` Tomas Nordin
0 siblings, 2 replies; 6+ messages in thread
From: Junio C Hamano @ 2024-07-23 0:35 UTC (permalink / raw)
To: Tomas Nordin; +Cc: git, charvi077
Junio C Hamano <gitster@pobox.com> writes:
> Wonderful. Thanks.
>
> Will queue.
Spoke too early. We need a matching change to in-code help,
otherwise t0450 would break.
Here is what I have, which hopefully needs no more fix-ups.
Thanks.
----- >8 --------- >8 -----
Subject: [PATCH] doc: remove dangling closing parenthesis
The second line of the synopsis, starting with [--dry-run] has a
dangling closing paren in the second optional group. Probably added by
mistake, so remove it.
Signed-off-by: Tomas Nordin <tomasn@posteo.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-commit.txt | 2 +-
builtin/commit.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 89ecfc63a8..c822113c11 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
- [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
+ [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]
[-F <file> | -m <msg>] [--reset-author] [--allow-empty]
[--allow-empty-message] [--no-verify] [-e] [--author=<author>]
[--date=<date>] [--cleanup=<mode>] [--[no-]status]
diff --git a/builtin/commit.c b/builtin/commit.c
index 6e1484446b..7f9dd45d05 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -41,7 +41,7 @@
static const char * const builtin_commit_usage[] = {
N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
- " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n"
+ " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]\n"
" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
--
2.46.0-rc1-52-gda884b23f2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] doc: remove dangling closing parenthesis
2024-07-23 0:35 ` Junio C Hamano
@ 2024-07-23 8:50 ` Karthik Nayak
2024-07-23 11:44 ` Tomas Nordin
1 sibling, 0 replies; 6+ messages in thread
From: Karthik Nayak @ 2024-07-23 8:50 UTC (permalink / raw)
To: Junio C Hamano, Tomas Nordin; +Cc: git, charvi077
[-- Attachment #1: Type: text/plain, Size: 2331 bytes --]
Junio C Hamano <gitster@pobox.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Wonderful. Thanks.
>>
>> Will queue.
>
> Spoke too early. We need a matching change to in-code help,
> otherwise t0450 would break.
>
> Here is what I have, which hopefully needs no more fix-ups.
>
> Thanks.
>
Can confirm that your patch below fixes t0450.
> ----- >8 --------- >8 -----
> Subject: [PATCH] doc: remove dangling closing parenthesis
>
> The second line of the synopsis, starting with [--dry-run] has a
> dangling closing paren in the second optional group. Probably added by
> mistake, so remove it.
>
> Signed-off-by: Tomas Nordin <tomasn@posteo.net>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> Documentation/git-commit.txt | 2 +-
> builtin/commit.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
> index 89ecfc63a8..c822113c11 100644
> --- a/Documentation/git-commit.txt
> +++ b/Documentation/git-commit.txt
> @@ -9,7 +9,7 @@ SYNOPSIS
> --------
> [verse]
> 'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
> - [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
> + [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]
> [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
> [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
> [--date=<date>] [--cleanup=<mode>] [--[no-]status]
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 6e1484446b..7f9dd45d05 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -41,7 +41,7 @@
>
> static const char * const builtin_commit_usage[] = {
> N_("git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
> - " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]\n"
> + " [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>]\n"
> " [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
> " [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
> " [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
> --
> 2.46.0-rc1-52-gda884b23f2
Looks good! Thanks.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 690 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] doc: remove dangling closing parenthesis
2024-07-23 0:35 ` Junio C Hamano
2024-07-23 8:50 ` Karthik Nayak
@ 2024-07-23 11:44 ` Tomas Nordin
2024-07-23 16:48 ` Junio C Hamano
1 sibling, 1 reply; 6+ messages in thread
From: Tomas Nordin @ 2024-07-23 11:44 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, charvi077
Junio C Hamano <gitster@pobox.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Wonderful. Thanks.
>>
>> Will queue.
>
> Spoke too early. We need a matching change to in-code help,
> otherwise t0450 would break.
Good test suit (which I didn't run)...
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] doc: remove dangling closing parenthesis
2024-07-23 11:44 ` Tomas Nordin
@ 2024-07-23 16:48 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2024-07-23 16:48 UTC (permalink / raw)
To: Tomas Nordin; +Cc: git, charvi077
Tomas Nordin <tomasn@posteo.net> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> Wonderful. Thanks.
>>>
>>> Will queue.
>>
>> Spoke too early. We need a matching change to in-code help,
>> otherwise t0450 would break.
>
> Good test suit (which I didn't run)...
It skips a large number of commands that have mismatch in "git cmd
-h" output and "git cmd --help | head" output. I am not sure what
our longer term plans are. Perhaps make it a #leftoverbit item to
shrink the t/t0450/txt-help-mismatches file? I dunno.
Thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-07-23 16:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-22 22:53 [PATCH 1/1] doc: remove dangling closing parenthesis Tomas Nordin
2024-07-22 22:59 ` Junio C Hamano
2024-07-23 0:35 ` Junio C Hamano
2024-07-23 8:50 ` Karthik Nayak
2024-07-23 11:44 ` Tomas Nordin
2024-07-23 16:48 ` Junio C Hamano
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 NNTP newsgroup(s).