From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Dec 2023 22:10:12 +0000 (-0800)
Subject: Merge branch 'jb/reflog-expire-delete-dry-run-options'
X-Git-Tag: v2.44.0-rc0~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=468d49634f3a56469890dece815f6dd8c34c2d72;p=thirdparty%2Fgit.git

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

Command line parsing fix for "git reflog".

* jb/reflog-expire-delete-dry-run-options:
  builtin/reflog.c: fix dry-run option short name
---

468d49634f3a56469890dece815f6dd8c34c2d72
diff --cc builtin/reflog.c
index 6e490f83d5,f2acecac9a..a5a4099f61
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@@ -366,9 -725,10 +366,9 @@@ static int cmd_reflog_delete(int argc, 
  	int i, status = 0;
  	unsigned int flags = 0;
  	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"),