From a762af3dfd9450bf1d6153faa620cb42efb7daa8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 19 Dec 2023 11:26:25 -0800 Subject: 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 --- remote.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'remote.h') 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; -- cgit v1.2.3