@matheusbsbs / matheus-bagliano / commits / a762af3dfd

remote.h: retire CAS_OPT_NAME

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>

Junio C Hamano committed Dec 19, 2023 at 11:26 UTC a762af3dfd9450bf1d6153faa620cb42efb7daa8

3 files changed +3 -5

builtin/push.c

+2 -2

@@ -393,7 +393,7 @@ static int push_with_options(struct transport *transport, struct refspec *rs,

393 if (!is_empty_cas(&cas)) {

394 if (!transport->smart_options)

395 die("underlying transport does not support --%s option",

396 - CAS_OPT_NAME);

396 + "force-with-lease");

397 transport->smart_options->cas = &cas;

398 }

399

@@ -604,7 +604,7 @@ int cmd_push(int argc, const char **argv, const char *prefix)

604 OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),

605 OPT_BIT( 0, "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),

606 OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),

607 - OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),

607 + OPT_CALLBACK_F(0, "force-with-lease", &cas, N_("<refname>:<expect>"),

608 N_("require old value of ref to be at this value"),

609 PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option),

610 OPT_BIT(0, TRANS_OPT_FORCE_IF_INCLUDES, &flags,

builtin/send-pack.c

+1 -1

@@ -207,7 +207,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)

207 OPT_BOOL(0, "stateless-rpc", &stateless_rpc, N_("use stateless RPC protocol")),

208 OPT_BOOL(0, "stdin", &from_stdin, N_("read refs from stdin")),

209 OPT_BOOL(0, "helper-status", &helper_status, N_("print status from remote helper")),

210 - OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),

210 + OPT_CALLBACK_F(0, "force-with-lease", &cas, N_("<refname>:<expect>"),

211 N_("require old value of ref to be at this value"),

212 PARSE_OPT_OPTARG, parseopt_push_cas_option),

213 OPT_BOOL(0, TRANS_OPT_FORCE_IF_INCLUDES, &force_if_includes,

remote.h

-2

@@ -398,8 +398,6 @@ struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map);

398 /*

399 * Compare-and-swap

400 */

401 -#define CAS_OPT_NAME "force-with-lease"

402 -

401 struct push_cas_option {

402 unsigned use_tracking_for_rest:1;

403 unsigned use_force_if_includes:1;