@matheusbsbs / matheus-bagliano / commits / 805d9eaf5e

Fork 0

Makefile: ASCII-sort += lists

There are many += lists in the Makefile and, over time, they have gotten slightly out of ASCII order. Sort all += lists to bring them back in order. ASCII sorting was chosen over strict alphabetical order even though, if we omit file prefixes, the lists aren't sorted in strictly alphabetical order (e.g. archive.o comes after archive-zip.o instead of before archive-tar.o). This is intentional because the purpose of maintaining the sorted list is to ensure line insertions are deterministic. By using ASCII ordering, it is more easily mechanically reproducible in the future, such as by using :sort in Vim. 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 Mar 21, 2020 at 05:21 UTC 805d9eaf5eab0edc3567d9e19e74a3f9168e764a

1 file changed +39 -38

Makefile

+39 -38

@@ -604,12 +604,12 @@ unexport CDPATH

604 SCRIPT_SH += git-bisect.sh

605 SCRIPT_SH += git-difftool--helper.sh

606 SCRIPT_SH += git-filter-branch.sh

607 +SCRIPT_SH += git-legacy-stash.sh

608 SCRIPT_SH += git-merge-octopus.sh

609 SCRIPT_SH += git-merge-one-file.sh

610 SCRIPT_SH += git-merge-resolve.sh

611 SCRIPT_SH += git-mergetool.sh

612 SCRIPT_SH += git-quiltimport.sh

612 -SCRIPT_SH += git-legacy-stash.sh

613 SCRIPT_SH += git-request-pull.sh

614 SCRIPT_SH += git-submodule.sh

615 SCRIPT_SH += git-web--browse.sh

@@ -617,8 +617,8 @@ SCRIPT_SH += git-web--browse.sh

617 SCRIPT_LIB += git-mergetool--lib

618 SCRIPT_LIB += git-parse-remote

619 SCRIPT_LIB += git-rebase--preserve-merges

620 -SCRIPT_LIB += git-sh-setup

620 SCRIPT_LIB += git-sh-i18n

621 +SCRIPT_LIB += git-sh-setup

622

623 SCRIPT_PERL += git-add--interactive.perl

624 SCRIPT_PERL += git-archimport.perl

@@ -686,9 +686,9 @@ PROGRAM_OBJS += daemon.o

686 PROGRAM_OBJS += fast-import.o

687 PROGRAM_OBJS += http-backend.o

688 PROGRAM_OBJS += imap-send.o

689 +PROGRAM_OBJS += remote-testsvn.o

690 PROGRAM_OBJS += sh-i18n--envsubst.o

691 PROGRAM_OBJS += shell.o

691 -PROGRAM_OBJS += remote-testsvn.o

692

693 # Binary suffix, set to .exe for Windows builds

694 X =

@@ -709,9 +709,9 @@ TEST_BUILTINS_OBJS += test-dump-untracked-cache.o

709 TEST_BUILTINS_OBJS += test-example-decorate.o

710 TEST_BUILTINS_OBJS += test-genrandom.o

711 TEST_BUILTINS_OBJS += test-genzeros.o

712 +TEST_BUILTINS_OBJS += test-hash-speed.o

713 TEST_BUILTINS_OBJS += test-hash.o

714 TEST_BUILTINS_OBJS += test-hashmap.o

714 -TEST_BUILTINS_OBJS += test-hash-speed.o

715 TEST_BUILTINS_OBJS += test-index-version.o

716 TEST_BUILTINS_OBJS += test-json-writer.o

717 TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o

@@ -737,8 +737,8 @@ TEST_BUILTINS_OBJS += test-revision-walking.o

737 TEST_BUILTINS_OBJS += test-run-command.o

738 TEST_BUILTINS_OBJS += test-scrap-cache-tree.o

739 TEST_BUILTINS_OBJS += test-serve-v2.o

740 -TEST_BUILTINS_OBJS += test-sha1.o

740 TEST_BUILTINS_OBJS += test-sha1-array.o

741 +TEST_BUILTINS_OBJS += test-sha1.o

742 TEST_BUILTINS_OBJS += test-sha256.o

743 TEST_BUILTINS_OBJS += test-sigchain.o

744 TEST_BUILTINS_OBJS += test-strcmp-offset.o

@@ -748,10 +748,10 @@ TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o

748 TEST_BUILTINS_OBJS += test-subprocess.o

749 TEST_BUILTINS_OBJS += test-trace2.o

750 TEST_BUILTINS_OBJS += test-urlmatch-normalization.o

751 -TEST_BUILTINS_OBJS += test-xml-encode.o

751 TEST_BUILTINS_OBJS += test-wildmatch.o

752 TEST_BUILTINS_OBJS += test-windows-named-pipe.o

753 TEST_BUILTINS_OBJS += test-write-cache.o

754 +TEST_BUILTINS_OBJS += test-xml-encode.o

755

756 # Do not add more tests here unless they have extra dependencies. Add

757 # them in TEST_BUILTINS_OBJS above.

@@ -788,10 +788,10 @@ OTHER_PROGRAMS = git$X

788

789 # what test wrappers are needed and 'install' will install, in bindir

790 BINDIR_PROGRAMS_NEED_X += git

791 -BINDIR_PROGRAMS_NEED_X += git-upload-pack

791 BINDIR_PROGRAMS_NEED_X += git-receive-pack

793 -BINDIR_PROGRAMS_NEED_X += git-upload-archive

792 BINDIR_PROGRAMS_NEED_X += git-shell

793 +BINDIR_PROGRAMS_NEED_X += git-upload-archive

794 +BINDIR_PROGRAMS_NEED_X += git-upload-pack

795

796 BINDIR_PROGRAMS_NO_X += git-cvsserver

797

@@ -831,9 +831,9 @@ LIB_OBJS += advice.o

831 LIB_OBJS += alias.o

832 LIB_OBJS += alloc.o

833 LIB_OBJS += apply.o

834 -LIB_OBJS += archive.o

834 LIB_OBJS += archive-tar.o

835 LIB_OBJS += archive-zip.o

836 +LIB_OBJS += archive.o

837 LIB_OBJS += argv-array.o

838 LIB_OBJS += attr.o

839 LIB_OBJS += base85.o

@@ -849,9 +849,9 @@ LIB_OBJS += checkout.o

849 LIB_OBJS += color.o

850 LIB_OBJS += column.o

851 LIB_OBJS += combine-diff.o

852 -LIB_OBJS += commit.o

852 LIB_OBJS += commit-graph.o

853 LIB_OBJS += commit-reach.o

854 +LIB_OBJS += commit.o

855 LIB_OBJS += compat/obstack.o

856 LIB_OBJS += compat/terminal.o

857 LIB_OBJS += config.o

@@ -865,17 +865,17 @@ LIB_OBJS += ctype.o

865 LIB_OBJS += date.o

866 LIB_OBJS += decorate.o

867 LIB_OBJS += delta-islands.o

868 +LIB_OBJS += diff-delta.o

869 +LIB_OBJS += diff-lib.o

870 +LIB_OBJS += diff-no-index.o

871 +LIB_OBJS += diff.o

872 LIB_OBJS += diffcore-break.o

873 LIB_OBJS += diffcore-delta.o

874 LIB_OBJS += diffcore-order.o

875 LIB_OBJS += diffcore-pickaxe.o

876 LIB_OBJS += diffcore-rename.o

873 -LIB_OBJS += diff-delta.o

874 -LIB_OBJS += diff-lib.o

875 -LIB_OBJS += diff-no-index.o

876 -LIB_OBJS += diff.o

877 -LIB_OBJS += dir.o

877 LIB_OBJS += dir-iterator.o

878 +LIB_OBJS += dir.o

879 LIB_OBJS += editor.o

880 LIB_OBJS += entry.o

881 LIB_OBJS += environment.o

@@ -893,7 +893,6 @@ LIB_OBJS += gpg-interface.o

893 LIB_OBJS += graph.o

894 LIB_OBJS += grep.o

895 LIB_OBJS += hashmap.o

896 -LIB_OBJS += linear-assignment.o

896 LIB_OBJS += help.o

897 LIB_OBJS += hex.o

898 LIB_OBJS += ident.o

@@ -903,9 +902,10 @@ LIB_OBJS += kwset.o

902 LIB_OBJS += levenshtein.o

903 LIB_OBJS += line-log.o

904 LIB_OBJS += line-range.o

906 -LIB_OBJS += list-objects.o

907 -LIB_OBJS += list-objects-filter.o

905 +LIB_OBJS += linear-assignment.o

906 LIB_OBJS += list-objects-filter-options.o

907 +LIB_OBJS += list-objects-filter.o

908 +LIB_OBJS += list-objects.o

909 LIB_OBJS += ll-merge.o

910 LIB_OBJS += lockfile.o

911 LIB_OBJS += log-tree.o

@@ -914,31 +914,31 @@ LIB_OBJS += mailinfo.o

914 LIB_OBJS += mailmap.o

915 LIB_OBJS += match-trees.o

916 LIB_OBJS += mem-pool.o

917 -LIB_OBJS += merge.o

917 LIB_OBJS += merge-blobs.o

918 LIB_OBJS += merge-recursive.o

919 +LIB_OBJS += merge.o

920 LIB_OBJS += mergesort.o

921 LIB_OBJS += midx.o

922 LIB_OBJS += name-hash.o

923 LIB_OBJS += negotiator/default.o

924 LIB_OBJS += negotiator/skipping.o

925 -LIB_OBJS += notes.o

925 LIB_OBJS += notes-cache.o

926 LIB_OBJS += notes-merge.o

927 LIB_OBJS += notes-utils.o

928 +LIB_OBJS += notes.o

929 LIB_OBJS += object.o

930 LIB_OBJS += oidmap.o

931 LIB_OBJS += oidset.o

932 -LIB_OBJS += packfile.o

933 -LIB_OBJS += pack-bitmap.o

932 LIB_OBJS += pack-bitmap-write.o

933 +LIB_OBJS += pack-bitmap.o

934 LIB_OBJS += pack-check.o

935 LIB_OBJS += pack-objects.o

936 LIB_OBJS += pack-revindex.o

937 LIB_OBJS += pack-write.o

938 +LIB_OBJS += packfile.o

939 LIB_OBJS += pager.o

940 -LIB_OBJS += parse-options.o

940 LIB_OBJS += parse-options-cb.o

941 +LIB_OBJS += parse-options.o

942 LIB_OBJS += patch-delta.o

943 LIB_OBJS += patch-ids.o

944 LIB_OBJS += path.o

@@ -955,8 +955,9 @@ LIB_OBJS += quote.o

955 LIB_OBJS += range-diff.o

956 LIB_OBJS += reachable.o

957 LIB_OBJS += read-cache.o

958 -LIB_OBJS += rebase.o

958 LIB_OBJS += rebase-interactive.o

959 +LIB_OBJS += rebase.o

960 +LIB_OBJS += ref-filter.o

961 LIB_OBJS += reflog-walk.o

962 LIB_OBJS += refs.o

963 LIB_OBJS += refs/files-backend.o

@@ -964,7 +965,6 @@ LIB_OBJS += refs/iterator.o

965 LIB_OBJS += refs/packed-backend.o

966 LIB_OBJS += refs/ref-cache.o

967 LIB_OBJS += refspec.o

967 -LIB_OBJS += ref-filter.o

968 LIB_OBJS += remote.o

969 LIB_OBJS += replace-object.o

970 LIB_OBJS += repo-settings.o

@@ -979,8 +979,8 @@ LIB_OBJS += serve.o

979 LIB_OBJS += server-info.o

980 LIB_OBJS += setup.o

981 LIB_OBJS += sha1-array.o

982 -LIB_OBJS += sha1-lookup.o

982 LIB_OBJS += sha1-file.o

983 +LIB_OBJS += sha1-lookup.o

984 LIB_OBJS += sha1-name.o

985 LIB_OBJS += shallow.o

986 LIB_OBJS += sideband.o

@@ -990,9 +990,9 @@ LIB_OBJS += stable-qsort.o

990 LIB_OBJS += strbuf.o

991 LIB_OBJS += streaming.o

992 LIB_OBJS += string-list.o

993 -LIB_OBJS += submodule.o

994 -LIB_OBJS += submodule-config.o

993 LIB_OBJS += sub-process.o

994 +LIB_OBJS += submodule-config.o

995 +LIB_OBJS += submodule.o

996 LIB_OBJS += symlinks.o

997 LIB_OBJS += tag.o

998 LIB_OBJS += tempfile.o

@@ -1011,11 +1011,11 @@ LIB_OBJS += trace2/tr2_tgt_normal.o

1011 LIB_OBJS += trace2/tr2_tgt_perf.o

1012 LIB_OBJS += trace2/tr2_tls.o

1013 LIB_OBJS += trailer.o

1014 -LIB_OBJS += transport.o

1014 LIB_OBJS += transport-helper.o

1015 +LIB_OBJS += transport.o

1016 LIB_OBJS += tree-diff.o

1017 -LIB_OBJS += tree.o

1017 LIB_OBJS += tree-walk.o

1018 +LIB_OBJS += tree.o

1019 LIB_OBJS += unpack-trees.o

1020 LIB_OBJS += upload-pack.o

1021 LIB_OBJS += url.o

@@ -1055,9 +1055,9 @@ BUILTIN_OBJS += builtin/checkout.o

1055 BUILTIN_OBJS += builtin/clean.o

1056 BUILTIN_OBJS += builtin/clone.o

1057 BUILTIN_OBJS += builtin/column.o

1058 +BUILTIN_OBJS += builtin/commit-graph.o

1059 BUILTIN_OBJS += builtin/commit-tree.o

1060 BUILTIN_OBJS += builtin/commit.o

1060 -BUILTIN_OBJS += builtin/commit-graph.o

1061 BUILTIN_OBJS += builtin/config.o

1062 BUILTIN_OBJS += builtin/count-objects.o

1063 BUILTIN_OBJS += builtin/credential.o

@@ -1088,13 +1088,13 @@ BUILTIN_OBJS += builtin/ls-remote.o

1088 BUILTIN_OBJS += builtin/ls-tree.o

1089 BUILTIN_OBJS += builtin/mailinfo.o

1090 BUILTIN_OBJS += builtin/mailsplit.o

1091 -BUILTIN_OBJS += builtin/merge.o

1091 BUILTIN_OBJS += builtin/merge-base.o

1092 BUILTIN_OBJS += builtin/merge-file.o

1093 BUILTIN_OBJS += builtin/merge-index.o

1094 BUILTIN_OBJS += builtin/merge-ours.o

1095 BUILTIN_OBJS += builtin/merge-recursive.o

1096 BUILTIN_OBJS += builtin/merge-tree.o

1097 +BUILTIN_OBJS += builtin/merge.o

1098 BUILTIN_OBJS += builtin/mktag.o

1099 BUILTIN_OBJS += builtin/mktree.o

1100 BUILTIN_OBJS += builtin/multi-pack-index.o

@@ -1114,9 +1114,9 @@ BUILTIN_OBJS += builtin/read-tree.o

1114 BUILTIN_OBJS += builtin/rebase.o

1115 BUILTIN_OBJS += builtin/receive-pack.o

1116 BUILTIN_OBJS += builtin/reflog.o

1117 -BUILTIN_OBJS += builtin/remote.o

1117 BUILTIN_OBJS += builtin/remote-ext.o

1118 BUILTIN_OBJS += builtin/remote-fd.o

1119 +BUILTIN_OBJS += builtin/remote.o

1120 BUILTIN_OBJS += builtin/repack.o

1121 BUILTIN_OBJS += builtin/replace.o

1122 BUILTIN_OBJS += builtin/rerere.o

@@ -2335,16 +2335,16 @@ reconfigure config.mak.autogen: config.status

2335 endif

2336

2337 XDIFF_OBJS += xdiff/xdiffi.o

2338 -XDIFF_OBJS += xdiff/xprepare.o

2339 -XDIFF_OBJS += xdiff/xutils.o

2338 XDIFF_OBJS += xdiff/xemit.o

2339 +XDIFF_OBJS += xdiff/xhistogram.o

2340 XDIFF_OBJS += xdiff/xmerge.o

2341 XDIFF_OBJS += xdiff/xpatience.o

2343 -XDIFF_OBJS += xdiff/xhistogram.o

2342 +XDIFF_OBJS += xdiff/xprepare.o

2343 +XDIFF_OBJS += xdiff/xutils.o

2344

2345 +VCSSVN_OBJS += vcs-svn/fast_export.o

2346 VCSSVN_OBJS += vcs-svn/line_buffer.o

2347 VCSSVN_OBJS += vcs-svn/sliding_window.o

2347 -VCSSVN_OBJS += vcs-svn/fast_export.o

2348 VCSSVN_OBJS += vcs-svn/svndiff.o

2349 VCSSVN_OBJS += vcs-svn/svndump.o

2350

@@ -3152,9 +3152,10 @@ endif

3152 #

3153 ALL_COMMANDS = $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS)

3154 ALL_COMMANDS += git

3155 +ALL_COMMANDS += git-citool

3156 +ALL_COMMANDS += git-gui

3157 ALL_COMMANDS += gitk

3158 ALL_COMMANDS += gitweb

3157 -ALL_COMMANDS += git-gui git-citool

3159

3160 .PHONY: check-docs

3161 check-docs::