summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-08-19 10:52:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-21 18:28:11 (GMT)
commiteb90ea79c59197e25a40fc3414a75d977f8a8f56 (patch)
tree3bb04c731533822ee88a435f4efaef5e5fabbca2 /Makefile
parent7e8bfb0412581daf8f3c89909f1d37844e8610dd (diff)
downloadgit-eb90ea79c59197e25a40fc3414a75d977f8a8f56.zip
git-eb90ea79c59197e25a40fc3414a75d977f8a8f56.tar.gz
git-eb90ea79c59197e25a40fc3414a75d977f8a8f56.tar.bz2
generate-cmdlist.sh: collect config from all config.txt files
This script uses Documentation/config.txt as input for "git help --config" and "git config" completion but it misses the fact that config.txt includes other txt files. Include all *config.txt as input when scanning for config keys. This could produce false positives, but as long as we stick to the blah-config.txt naming convention, we should be ok. While at there, move diff.* from config.txt to diff-config.txt where all other diff config keys are. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d03df31..5a969f5 100644
--- a/Makefile
+++ b/Makefile
@@ -2047,7 +2047,7 @@ $(BUILT_INS): git$X
command-list.h: generate-cmdlist.sh command-list.txt
-command-list.h: $(wildcard Documentation/git*.txt) Documentation/config.txt
+command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh command-list.txt >$@+ && mv $@+ $@
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\