development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 14:03:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jb/reflog-expire-delete-dry-run-options'

Browse source 
Command line parsing fix for "git reflog".

* jb/reflog-expire-delete-dry-run-options:
  builtin/reflog.c: fix dry-run option short name
This commit is contained in:
Junio C Hamano 2023-12-18 14:10:12 -08:00
commit 468d49634f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/reflog.c
View file

@ -248,7 +248,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"),
@ -368,7 +368,7 @@ static int cmd_reflog_delete(int argc, const char **argv, const char *prefix)
int verbose = 0; int verbose = 0;
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"),