[PATCH] remote.h: retire CAS_OPT_NAME
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 19, 2023, 19:26 UTC
- Message-ID
- <xmqq5y0uc7tq.fsf@gitster.g>
When the "--force-with-lease" option was introduced in 28f5d176 (remote.c: add command line option parser for "--force-with-lease", 2013-07-08), the design discussion revolved around the concept of "compare-and-swap", and it can still be seen in the name used for variables and helper functions. The end-user facing option name ended up to be a bit different, so during the development iteration of the feature, we used this C preprocessor macro to make it easier to rename it later.
All of that happened more than 10 years ago, and the flexibility afforded by the CAS_OPT_NAME macro outlived its usefulness. Inline the constant string for the option name, like all other option names in the code.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/push.c | 4 ++-- builtin/send-pack.c | 2 +- remote.h | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/builtin/push.c b/builtin/push.c index dbdf609daf..e740dd93e3 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -393,7 +393,7 @@ static int push_with_options(struct transport *transport, struct refspec *rs, if (!is_empty_cas(&cas)) { if (!transport->smart_options) die("underlying transport does not support --%s option", - CAS_OPT_NAME); + "force-with-lease"); transport->smart_options->cas = &cas; } @@ -604,7 +604,7 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN), OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN), OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE), - OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"), + OPT_CALLBACK_F(0, "force-with-lease", &cas, N_("<refname>:<expect>"), N_("require old value of ref to be at this value"), PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option), OPT_BIT(0, TRANS_OPT_FORCE_IF_INCLUDES, &flags, diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 4784143004..87e5269e9f 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -207,7 +207,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "stateless-rpc", &stateless_rpc, N_("use stateless RPC protocol")), OPT_BOOL(0, "stdin", &from_stdin, N_("read refs from stdin")), OPT_BOOL(0, "helper-status", &helper_status, N_("print status from remote helper")), - OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"), + OPT_CALLBACK_F(0, "force-with-lease", &cas, N_("<refname>:<expect>"), N_("require old value of ref to be at this value"), PARSE_OPT_OPTARG, parseopt_push_cas_option), OPT_BOOL(0, TRANS_OPT_FORCE_IF_INCLUDES, &force_if_includes, diff --git a/remote.h b/remote.h index 73638cefeb..9ba7f7d3e2 100644 --- a/remote.h +++ b/remote.h @@ -398,8 +398,6 @@ struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map); /* * Compare-and-swap */ -#define CAS_OPT_NAME "force-with-lease" - struct push_cas_option { unsigned use_tracking_for_rest:1; unsigned use_force_if_includes:1;
-- 2.43.0-121-g624eb90fa8