completion: take into account the formatting backticks for options

With the modern formatting of the manpages, the options and commands are now
backticked in their definition lists. This patch updates the generation of
the completion list to take into account this new format.

The script `generate-configlist.sh` is updated to get rid of extraneous
commands and fit everything in a single sed script.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/generate-configlist.sh b/generate-configlist.sh
index dffdaada8b5b395770df7f565002a28598d0ea38..b06da53c8918196a465d4f37eb139274c549e044 100755 (executable)
--- a/generate-configlist.sh
+++ b/generate-configlist.sh
@@ -13,10 +13,18 @@ print_config_list () {
        cat <<EOF
 static const char *config_name_list[] = {
 EOF
-       grep -h '^[a-zA-Z].*\..*::$' "$SOURCE_DIR"/Documentation/*config.adoc "$SOURCE_DIR"/Documentation/config/*.adoc |
-       sed '/deprecated/d; s/::$//; s/,  */\n/g' |
-       sort |
-       sed 's/^.*$/    "&",/'
+       sed -E '
+/^`?[a-zA-Z].*\..*`?::$/ {
+       /deprecated/d;
+       s/::$//;
+       s/`//g;
+       s/^.*$/ "&",/;
+       s/,  */",\n     "/g;
+       p;};
+d' \
+           "$SOURCE_DIR"/Documentation/*config.adoc \
+           "$SOURCE_DIR"/Documentation/config/*.adoc|
+       sort
        cat <<EOF
        NULL,
 };