Makefile: ASCII-sort += lists
In 805d9eaf5e (Makefile: ASCII-sort += lists, 2020-03-21), the += lists in the Makefile were sorted into ASCII order. Since then, more out of order elements have been introduced. Sort these lists back into ASCII order. This patch is best viewed with `--color-moved`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 8, 2020 at 00:39 UTC
8474f2658156157476e84e8b0ad2b8dcd6354f39
1 file changed
+5
-5
Makefile
+5
-5
@@ -820,8 +820,8 @@ TEST_SHELL_PATH = $(SHELL_PATH)
820
LIB_FILE = libgit.a
821
XDIFF_LIB = xdiff/lib.a
822
823
-GENERATED_H += config-list.h
823
GENERATED_H += command-list.h
824
+GENERATED_H += config-list.h
825
826
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
827
$(FIND) . \
@@ -998,9 +998,9 @@ LIB_OBJS += sigchain.o
998
LIB_OBJS += split-index.o
999
LIB_OBJS += stable-qsort.o
1000
LIB_OBJS += strbuf.o
1001
-LIB_OBJS += strvec.o
1001
LIB_OBJS += streaming.o
1002
LIB_OBJS += string-list.o
1003
+LIB_OBJS += strvec.o
1004
LIB_OBJS += sub-process.o
1005
LIB_OBJS += submodule-config.o
1006
LIB_OBJS += submodule.o
@@ -1066,15 +1066,15 @@ BUILTIN_OBJS += builtin/checkout-index.o
1066
BUILTIN_OBJS += builtin/checkout.o
1067
BUILTIN_OBJS += builtin/clean.o
1068
BUILTIN_OBJS += builtin/clone.o
1069
-BUILTIN_OBJS += builtin/credential-cache.o
1070
-BUILTIN_OBJS += builtin/credential-cache--daemon.o
1071
-BUILTIN_OBJS += builtin/credential-store.o
1069
BUILTIN_OBJS += builtin/column.o
1070
BUILTIN_OBJS += builtin/commit-graph.o
1071
BUILTIN_OBJS += builtin/commit-tree.o
1072
BUILTIN_OBJS += builtin/commit.o
1073
BUILTIN_OBJS += builtin/config.o
1074
BUILTIN_OBJS += builtin/count-objects.o
1075
+BUILTIN_OBJS += builtin/credential-cache--daemon.o
1076
+BUILTIN_OBJS += builtin/credential-cache.o
1077
+BUILTIN_OBJS += builtin/credential-store.o
1078
BUILTIN_OBJS += builtin/credential.o
1079
BUILTIN_OBJS += builtin/describe.o
1080
BUILTIN_OBJS += builtin/diff-files.o