Re: [PATCH v5 11/30] fsmonitor--daemon: implement 'start' command

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Jeff,

something I missed in my review, but which causes failures in `seen`
because of the interplay with `ac/usage-string-fixups`:

On Fri, 11 Feb 2022, Jeff Hostetler via GitGitGadget wrote:

>  int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
>  {
>  	const char *subcmd;
> +	int free_console = 0;
>
>  	struct option options[] = {
> +		OPT_BOOL(0, "free-console", &free_console, N_("free console")),
>  		OPT_INTEGER(0, "ipc-threads",
>  			    &fsmonitor__ipc_threads,
>  			    N_("use <n> ipc worker threads")),
> +		OPT_INTEGER(0, "start-timeout",
> +			    &fsmonitor__start_timeout_sec,
> +			    N_("Max seconds to wait for background daemon startup")),

Git is about to be stricter about these option usage strings: they are no
longer allowed to start with an upper-case letter. This diff fixes it for me:

-- snip --
From: Johannes Schindelin <johannes.schindelin@xxxxxx>
Date: Thu, 24 Feb 2022 15:48:01 +0100
Subject: [PATCH] fixup??? fsmonitor--daemon: implement 'start' command

There is a patch series in `seen` that errors out on option usage
strings starting with a capital letter. Let's avoid that preemptively.

Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
 builtin/fsmonitor--daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/fsmonitor--daemon.c b/builtin/fsmonitor--daemon.c
index 591433e897df..775e4de5584d 100644
--- a/builtin/fsmonitor--daemon.c
+++ b/builtin/fsmonitor--daemon.c
@@ -1504,7 +1504,7 @@ int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
 			    N_("use <n> ipc worker threads")),
 		OPT_INTEGER(0, "start-timeout",
 			    &fsmonitor__start_timeout_sec,
-			    N_("Max seconds to wait for background daemon startup")),
+			    N_("max seconds to wait for background daemon startup")),

 		OPT_END()
 	};
--
2.35.1.windows.2
-- snap --

Could I ask you to squash this in before you send a new iteration?

Thank you,
Dscho


> +
>  		OPT_END()
>  	};
>




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux