diff options
| author | Collin Funk <collin.funk1@gmail.com> | 2025-06-02 15:31:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-02 17:21:49 -0700 |
| commit | db170e18262ed10e5e9b7f3cbca6a0ac43267b20 (patch) | |
| tree | e74cf847d862202b92086a0cecdb3e72edf49533 | |
| parent | b07857f7dcffee4d3b428df8dce6c9b49a57c9c1 (diff) | |
| download | git-db170e18262ed10e5e9b7f3cbca6a0ac43267b20.tar.xz | |
completion: make sed command that generates config-list.h portable.
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 fix this by documenting related configuration variables
one-per-line instead of listing them separated by commas. This allows us
to remove the unportable part of the sed expression in
generate-configlist.sh.
Signed-off-by: Collin Funk <collin.funk1@gmail.com>
Reviewed-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config/gitcvs.adoc | 3 | ||||
| -rw-r--r-- | Documentation/config/http.adoc | 3 | ||||
| -rwxr-xr-x | generate-configlist.sh | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/config/gitcvs.adoc b/Documentation/config/gitcvs.adoc index 02da427fd9..31d7be3992 100644 --- a/Documentation/config/gitcvs.adoc +++ b/Documentation/config/gitcvs.adoc @@ -47,7 +47,8 @@ gitcvs.dbDriver:: May not contain double colons (`:`). Default: 'SQLite'. See linkgit:git-cvsserver[1]. -gitcvs.dbUser, gitcvs.dbPass:: +gitcvs.dbUser:: +gitcvs.dbPass:: Database user and password. Only useful if setting `gitcvs.dbDriver`, since SQLite has no concept of database users and/or passwords. 'gitcvs.dbUser' supports variable substitution (see diff --git a/Documentation/config/http.adoc b/Documentation/config/http.adoc index 67393282fa..9da5c298cc 100644 --- a/Documentation/config/http.adoc +++ b/Documentation/config/http.adoc @@ -289,7 +289,8 @@ for most push problems, but can increase memory consumption significantly since the entire buffer is allocated even for small pushes. -http.lowSpeedLimit, http.lowSpeedTime:: +http.lowSpeedLimit:: +http.lowSpeedTime:: If the HTTP transfer speed, in bytes per second, is less than 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. diff --git a/generate-configlist.sh b/generate-configlist.sh index b06da53c89..9d2ad6165d 100755 --- a/generate-configlist.sh +++ b/generate-configlist.sh @@ -19,7 +19,6 @@ EOF s/::$//; s/`//g; s/^.*$/ "&",/; - s/, */",\n "/g; p;}; d' \ "$SOURCE_DIR"/Documentation/*config.adoc \ |