From: "Jean-Noël AVILA" <jn.avila@free.fr>
To: git@vger.kernel.org, Collin Funk <collin.funk1@gmail.com>
Cc: Collin Funk <collin.funk1@gmail.com>,
Patrick Steinhardt <ps@pks.im>,
Junio C Hamano <gitster@pobox.com>,
vital.had@gmail.com
Subject: Re: [PATCH] completion: Make sed command that generates config-list.h portable.
Date: Mon, 02 Jun 2025 21:05:56 +0200 [thread overview]
Message-ID: <4986157.GXAFRqVoOG@cayenne> (raw)
In-Reply-To: <0ab924839df48d869682bea1b0cb400f378ca6dc.1748889654.git.collin.funk1@gmail.com>
On Monday, 2 June 2025 20:41:48 CEST Collin Funk wrote:
> The OpenBSD 'sed' command does not support '\n' to represent newlines in
> sed expressions. This leads to the follow compiler error:
>
> In file included from builtin/help.c:15:
> ./config-list.h:282:18: error: use of undeclared identifier 'n'
> "gitcvs.dbUser",n "gitcvs.dbPass",
> ^
> 1 error generated.
> gmake: *** [Makefile:2821: builtin/help.o] Error 1
>
> We can use a variable that expands to a newline to do this portably.
>
> This portably issue was introduced in e1b81f54da (completion: take into
> account the formatting backticks for options, 2025-03-19)
>
> Signed-off-by: Collin Funk <collin.funk1@gmail.com>
> ---
> generate-configlist.sh | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/generate-configlist.sh b/generate-configlist.sh
> index b06da53c89..48ec8d9812 100755
> --- a/generate-configlist.sh
> +++ b/generate-configlist.sh
> @@ -1,5 +1,8 @@
> #!/bin/sh
>
> +nl='
> +'
> +
> SOURCE_DIR="$1"
> OUTPUT="$2"
>
> @@ -19,7 +22,7 @@ EOF
> s/::$//;
> s/`//g;
> s/^.*$/ "&",/;
> - s/, */",\n "/g;
> + s/, */",''"$nl"'' "/g;
> p;};
> d' \
> "$SOURCE_DIR"/Documentation/*config.adoc \
Hello,
I was on this issue here:
https://github.com/git/git/commit/e1b81f54da80267edee2cb8fd0d0f75f03023019
Your proposed fix is interesting in that it does not spawn an additional
process, but it does not work for me (debian sh = dash).
ᐅ diff config-list.h config-list.h.new
281d280
< "gitcvs.dbPass",
283c282
< "gitcvs.dbUser",
---
> "gitcvs.dbUser","$nl" "gitcvs.dbPass",
350,351c349
< "http.lowSpeedLimit",
< "http.lowSpeedTime",
---
> "http.lowSpeedLimit","$nl" "http.lowSpeedTime",
If you'd like to test your patch on different systems and happen to have a
github account, you can open a PR to gitgitgadget/git . This will trigger
builds on several targets.
Thanks,
JN
next prev parent reply other threads:[~2025-06-02 19:07 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-02 18:41 [PATCH] completion: Make sed command that generates config-list.h portable Collin Funk
2025-06-02 19:05 ` Brad Smith
2025-06-02 19:05 ` Jean-Noël AVILA [this message]
2025-06-02 19:20 ` Collin Funk
2025-06-02 19:26 ` [PATCH v2] " Collin Funk
2025-06-02 19:49 ` Jean-Noël AVILA
2025-06-02 20:08 ` Collin Funk
2025-06-02 21:42 ` Jacob Keller
2025-06-02 22:35 ` Collin Funk
2025-06-03 0:21 ` Junio C Hamano
2025-06-03 0:49 ` [PATCH] CodingGuidelines: document formatting required by generate-configlist.sh Collin Funk
2025-06-03 14:54 ` Junio C Hamano
2025-06-03 18:56 ` Collin Funk
2025-06-03 20:43 ` Junio C Hamano
2025-06-03 22:49 ` Collin Funk
2025-06-03 22:45 ` [PATCH v2] CodingGuidelines: document formatting of similar config variables Collin Funk
2025-06-03 23:57 ` Junio C Hamano
2025-06-02 22:31 ` [PATCH v3] completion: make sed command that generates config-list.h portable Collin Funk
2025-06-02 23:05 ` Keller, Jacob E
2025-06-03 0:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4986157.GXAFRqVoOG@cayenne \
--to=jn.avila@free.fr \
--cc=collin.funk1@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
--cc=vital.had@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).