Skip to content

Commit e245b4e

Browse files
committed
Merge branch 'dl/makefile-sort'
Makefile clean-up. * dl/makefile-sort: Makefile: ASCII-sort += lists
2 parents 86e1007 + 8474f26 commit e245b4e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -820,8 +820,8 @@ TEST_SHELL_PATH = $(SHELL_PATH)
820820
LIB_FILE = libgit.a
821821
XDIFF_LIB = xdiff/lib.a
822822

823-
GENERATED_H += config-list.h
824823
GENERATED_H += command-list.h
824+
GENERATED_H += config-list.h
825825

826826
LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
827827
$(FIND) . \
@@ -998,9 +998,9 @@ LIB_OBJS += sigchain.o
998998
LIB_OBJS += split-index.o
999999
LIB_OBJS += stable-qsort.o
10001000
LIB_OBJS += strbuf.o
1001-
LIB_OBJS += strvec.o
10021001
LIB_OBJS += streaming.o
10031002
LIB_OBJS += string-list.o
1003+
LIB_OBJS += strvec.o
10041004
LIB_OBJS += sub-process.o
10051005
LIB_OBJS += submodule-config.o
10061006
LIB_OBJS += submodule.o
@@ -1066,15 +1066,15 @@ BUILTIN_OBJS += builtin/checkout-index.o
10661066
BUILTIN_OBJS += builtin/checkout.o
10671067
BUILTIN_OBJS += builtin/clean.o
10681068
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
10721069
BUILTIN_OBJS += builtin/column.o
10731070
BUILTIN_OBJS += builtin/commit-graph.o
10741071
BUILTIN_OBJS += builtin/commit-tree.o
10751072
BUILTIN_OBJS += builtin/commit.o
10761073
BUILTIN_OBJS += builtin/config.o
10771074
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
10781078
BUILTIN_OBJS += builtin/credential.o
10791079
BUILTIN_OBJS += builtin/describe.o
10801080
BUILTIN_OBJS += builtin/diff-files.o

0 commit comments

Comments
 (0)