debian/patches/git-gui-Sort-entries-in-optimized-tclIndex.diff

   1 From a74fe226d8247a1fb78947fadccbff0a041fa8dc Mon Sep 17 00:00:00 2001
   2 From: Anders Kaseorg <andersk@mit.edu>
   3 Date: Wed, 16 Nov 2016 16:37:17 -0500
   4 Subject: git-gui: sort entries in optimized tclIndex
   5
   6 commit 474642b4a47c74a1f277955d7387d1886546fa01 upstream.
   7
   8 auto_mkindex expands wildcards in directory order, which depends on
   9 the underlying filesystem.  To improve build reproducibility, sort the
  10 list of *.tcl files in the Makefile.
  11
  12 The unoptimized loading case was previously fixed in gitgui-0.21.0~14
  13 (git-gui: sort entries in tclIndex, 2015-01-26).
  14
  15 Signed-off-by: Anders Kaseorg <andersk@mit.edu>
  16 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  17 Signed-off-by: Junio C Hamano <gitster@pobox.com>
  18 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  19 ---
  20  git-gui/Makefile | 2 +-
  21  1 file changed, 1 insertion(+), 1 deletion(-)
  22
  23 diff --git a/git-gui/Makefile b/git-gui/Makefile
  24 index 918a8de369..f10caedaa7 100644
  25 --- a/git-gui/Makefile
  26 +++ b/git-gui/Makefile
  27 @@ -254,7 +254,7 @@ $(ALL_MSGFILES): %.msg : %.po
  28  lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
  29         $(QUIET_INDEX)if echo \
  30           $(foreach p,$(PRELOAD_FILES),source $p\;) \
  31 -         auto_mkindex lib '*.tcl' \
  32 +         auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
  33         | $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
  34         else \
  35          echo >&2 "    * $(TCL_PATH) failed; using unoptimized loading"; \
  36 --
  37 2.15.0.531.g2ccb3012c9
  38