admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

completion: make sed command that generates config-list.h portable.

Browse Source 
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>
This commit is contained in:
Collin Funk
2025-06-02 15:31:32 -07:00
committed by Junio C Hamano
parent b07857f7dc
commit db170e1826
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/config/gitcvs.adoc
View File

@@ -47,7 +47,8 @@ gitcvs.dbDriver::
May not contain double colons (`:`). Default: 'SQLite'. May not contain double colons (`:`). Default: 'SQLite'.
See linkgit:git-cvsserver[1]. See linkgit:git-cvsserver[1].
gitcvs.dbUser, gitcvs.dbPass:: gitcvs.dbUser::
gitcvs.dbPass::
Database user and password. Only useful if setting `gitcvs.dbDriver`, Database user and password. Only useful if setting `gitcvs.dbDriver`,
since SQLite has no concept of database users and/or passwords. since SQLite has no concept of database users and/or passwords.
'gitcvs.dbUser' supports variable substitution (see 'gitcvs.dbUser' supports variable substitution (see

3
Documentation/config/http.adoc
View File

@@ -289,7 +289,8 @@ for most push problems, but can increase memory consumption
significantly since the entire buffer is allocated even for small significantly since the entire buffer is allocated even for small
pushes. pushes.
http.lowSpeedLimit, http.lowSpeedTime:: http.lowSpeedLimit::
http.lowSpeedTime::
If the HTTP transfer speed, in bytes per second, is less than If the HTTP transfer speed, in bytes per second, is less than
'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds,
the transfer is aborted. the transfer is aborted.

1
generate-configlist.sh
View File

@@ -19,7 +19,6 @@ EOF
s/::$//; s/::$//;
s/`//g; s/`//g;
s/^.*$/ "&",/; s/^.*$/ "&",/;
s/, */",\n "/g;
p;}; p;};
d' \ d' \
"$SOURCE_DIR"/Documentation/*config.adoc \ "$SOURCE_DIR"/Documentation/*config.adoc \