freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Collin Funk and committed by
Junio C Hamano db170e18 b07857f7

+4 -3
+2 -1
Documentation/config/gitcvs.adoc
··· 47 May not contain double colons (`:`). Default: 'SQLite'. 48 See linkgit:git-cvsserver[1]. 49 50 - gitcvs.dbUser, gitcvs.dbPass:: 51 Database user and password. Only useful if setting `gitcvs.dbDriver`, 52 since SQLite has no concept of database users and/or passwords. 53 'gitcvs.dbUser' supports variable substitution (see
··· 47 May not contain double colons (`:`). Default: 'SQLite'. 48 See linkgit:git-cvsserver[1]. 49 50 + gitcvs.dbUser:: 51 + gitcvs.dbPass:: 52 Database user and password. Only useful if setting `gitcvs.dbDriver`, 53 since SQLite has no concept of database users and/or passwords. 54 'gitcvs.dbUser' supports variable substitution (see
+2 -1
Documentation/config/http.adoc
··· 289 significantly since the entire buffer is allocated even for small 290 pushes. 291 292 - http.lowSpeedLimit, http.lowSpeedTime:: 293 If the HTTP transfer speed, in bytes per second, is less than 294 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, 295 the transfer is aborted.
··· 289 significantly since the entire buffer is allocated even for small 290 pushes. 291 292 + http.lowSpeedLimit:: 293 + http.lowSpeedTime:: 294 If the HTTP transfer speed, in bytes per second, is less than 295 'http.lowSpeedLimit' for longer than 'http.lowSpeedTime' seconds, 296 the transfer is aborted.
-1
generate-configlist.sh
··· 19 s/::$//; 20 s/`//g; 21 s/^.*$/ "&",/; 22 - s/, */",\n "/g; 23 p;}; 24 d' \ 25 "$SOURCE_DIR"/Documentation/*config.adoc \
··· 19 s/::$//; 20 s/`//g; 21 s/^.*$/ "&",/; 22 p;}; 23 d' \ 24 "$SOURCE_DIR"/Documentation/*config.adoc \