mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/reflog.c: fix dry-run option short name

Browse Source 
The documentation for reflog states that the --dry-run option of the
expire and delete subcommands has a corresponding short name, -n.
However, 33d7bdd645 (builtin/reflog.c: use parse-options api for expire,
delete subcommands, 2022-01-06) did not include this short name in the
new options parsing.

Re-add the short name in the new dry-run option definitions.

Signed-off-by: Josh Brobst <josh@brob.st>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Josh Brobst
2023-11-25 19:05:14 -05:00
committed by Junio C Hamano
parent 33d7bdd645
commit cbf498eb53
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/reflog.c
View File

@ -592,7 +592,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
int verbose = 0; int verbose = 0;
reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent; reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
const struct option options[] = { const struct option options[] = {
OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"), OPT_BIT('n', "dry-run", &flags, N_("do not actually prune any entries"),
EXPIRE_REFLOGS_DRY_RUN), EXPIRE_REFLOGS_DRY_RUN),
OPT_BIT(0, "rewrite", &flags, OPT_BIT(0, "rewrite", &flags,
N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"), N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"),
@ -728,7 +728,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
int verbose = 0; int verbose = 0;
reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent; reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
const struct option options[] = { const struct option options[] = {
OPT_BIT(0, "dry-run", &flags, N_("do not actually prune any entries"), OPT_BIT('n', "dry-run", &flags, N_("do not actually prune any entries"),
EXPIRE_REFLOGS_DRY_RUN), EXPIRE_REFLOGS_DRY_RUN),
OPT_BIT(0, "rewrite", &flags, OPT_BIT(0, "rewrite", &flags,
N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"), N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"),