aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Brobst <josh@brob.st>2023-11-25 19:05:14 -0500
committerJunio C Hamano <gitster@pobox.com>2023-11-26 09:35:42 +0900
commitcbf498eb534c5a41c2c4fa5681d18e22d93b8fb4 (patch)
tree170d15b93dd0a0c7de0889d0a380da63e66821b9
parent33d7bdd64592d6dc86583a817719f91d7344e958 (diff)
downloadgit-cbf498eb534c5a41c2c4fa5681d18e22d93b8fb4.tar.gz
builtin/reflog.c: fix dry-run option short name
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>
-rw-r--r--builtin/reflog.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 85b838720c..f2acecac9a 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -592,7 +592,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
int verbose = 0;
reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
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),
OPT_BIT(0, "rewrite", &flags,
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;
reflog_expiry_should_prune_fn *should_prune_fn = should_expire_reflog_ent;
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),
OPT_BIT(0, "rewrite", &flags,
N_("rewrite the old SHA1 with the new SHA1 of the entry that now precedes it"),