From: René Scharfe <l.s.r@web.de>
Date: Thu, 2 Aug 2018 19:17:58 +0000 (+0200)
Subject: send-pack: specify --force-with-lease argument help explicitly
X-Git-Tag: v2.19.0-rc0~50^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1758abed1a54568eab720177fe60178203887e80?ds=inline;hp=--cc

send-pack: specify --force-with-lease argument help explicitly

Wrap each part of the argument help string in angular brackets to show
that users need to replace them with actual values.  Do that explicitly
to balance the pairs nicely in the code and avoid confusing casual
readers.  Add the flag PARSE_OPT_LITERAL_ARGHELP to keep parseopt from
adding another pair.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

1758abed1a54568eab720177fe60178203887e80
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index fc4f0bb5fb..c8af374dee 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -177,9 +177,10 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "stdin", &from_stdin, N_("read refs from stdin")),
 		OPT_BOOL(0, "helper-status", &helper_status, N_("print status from remote helper")),
 		{ OPTION_CALLBACK,
-		  0, CAS_OPT_NAME, &cas, N_("refname>:<expect"),
+		  0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
 		  N_("require old value of ref to be at this value"),
-		  PARSE_OPT_OPTARG, parseopt_push_cas_option },
+		  PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
+		  parseopt_push_cas_option },
 		OPT_END()
 	};