git/git-gui-tclIndex.patch

27 lines
1.0 KiB
Diff
Raw Normal View History

Date: Wed, 16 Nov 2016 16:46:06 -0500 (EST)
Subject: git-gui: Sort entries in optimized tclIndex
From: Anders Kaseorg <andersk@mit.edu>
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 (7 lines below) was previously fixed in
v2.11.0-rc0~31^2^2~14 “git-gui: sort entries in tclIndex”.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Index: git-2.11.0/git-gui/Makefile
===================================================================
--- git-2.11.0.orig/git-gui/Makefile
+++ git-2.11.0/git-gui/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"; \