Re: [PATCH v2 26/35] doc txt & -h consistency: make "stash" consistent
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Sep 29, 2022, 04:41 UTC
- Message-ID
- <CAPig+cRm5U45dhQuW1xAmhPZ=rn4b=QoRv1t0u3RtFaC374Y9w@mail.gmail.com>
- In-Reply-To
- <patch-v2-26.35-ac62cda1ab2-20220928T082458Z-avarab@gmail.com>
On Wed, Sep 28, 2022 at 4:44 AM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:
> Amend both the the -h output and *.txt to match one another. In this
s/the the/the/
Show 36 quoted lines
> case the *.txt didn't list the "save" subcommand, and the "-h" was
> similarly missing some commands.
>
> Let's also convert the *.c code to use a macro definition, similar to
> that used in preceding commits. This avoids duplication.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> diff --git a/builtin/stash.c b/builtin/stash.c
> @@ -21,72 +21,95 @@
> static const char * const git_stash_usage[] = {
> + BUILTIN_STASH_LIST_USAGE,
> + BUILTIN_STASH_SHOW_USAGE,
> + BUILTIN_STASH_DROP_USAGE,
> + BUILTIN_STASH_POP_USAGE,
> + BUILTIN_STASH_APPLY_USAGE,
> + BUILTIN_STASH_BRANCH_USAGE,
> + BUILTIN_STASH_PUSH_USAGE,
> + BUILTIN_STASH_SAVE_USAGE,
> + BUILTIN_STASH_CLEAR_USAGE,
> + BUILTIN_STASH_CREATE_USAGE,
> + BUILTIN_STASH_STORE_USAGE,
> NULL
> };
>
> static const char * const git_stash_branch_usage[] = {
> - N_("git stash branch <branchname> [<stash>]"),
> + BUILTIN_STASH_BRANCH_USAGE,
> NULL
> };
>
> static const char * const git_stash_clear_usage[] = {
> - "git stash clear",
> + BUILTIN_STASH_BRANCH_USAGE,
> NULL
> };Copy/paste error: s/BRANCH/CLEAR/