summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Anders Kaseorg <andersk@mit.edu>2016-11-16 16:37:17 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-22 13:46:57 +0900
commit474642b4a47c74a1f277955d7387d1886546fa01 (patch)
tree2b8d9633d7df4d3d9f5ce3a945219b3dadcb0aab
parentMerge remote-tracking branch 'philoakley/dup-gui' (diff)
downloadtgif-474642b4a47c74a1f277955d7387d1886546fa01.tar.xz
git-gui: sort entries in optimized tclIndex
auto_mkindex expands wildcards in directory order, which depends on the underlying filesystem. To improve build reproducibility, sort the list of *.tcl files in the Makefile. The unoptimized loading case was previously fixed in gitgui-0.21.0~14 (git-gui: sort entries in tclIndex, 2015-01-26). Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index fe30be38dc..f94b3e13d6 100644
--- a/Makefile
+++ b/Makefile
@@ -252,7 +252,7 @@ $(ALL_MSGFILES): %.msg : %.po
lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
$(QUIET_INDEX)if echo \
$(foreach p,$(PRELOAD_FILES),source $p\;) \
- auto_mkindex lib '*.tcl' \
+ auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
else \
echo >&2 " * $(TCL_PATH) failed; using unoptimized loading"; \