[PATCH] fixup! Makefile: define THIRD_PARTY_SOURCES
* expand the comment to show what it's used for
* alphabetical ordering fix
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
Makefile | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 522342a46c..617c25d16b 100644
--- a/Makefile
+++ b/Makefile
@@ -1147,12 +1147,15 @@ BUILTIN_OBJS += builtin/verify-tag.o
BUILTIN_OBJS += builtin/worktree.o
BUILTIN_OBJS += builtin/write-tree.o
-# THIRD_PARTY_SOURCES is a list of patterns compatible with
-# the $(filter) and $(filter-out) family of functions
+# THIRD_PARTY_SOURCES is a list of patterns compatible with the
+# $(filter) and $(filter-out) family of functions. They specify source
+# files which are taken from some third-party source where we want to be
+# less strict about issues such as coding style so we don't diverge from
+# upstream unnecessarily (making merging in future changes easier).
THIRD_PARTY_SOURCES += compat/inet_ntop.c
THIRD_PARTY_SOURCES += compat/inet_pton.c
-THIRD_PARTY_SOURCES += compat/obstack.%
THIRD_PARTY_SOURCES += compat/nedmalloc/%
+THIRD_PARTY_SOURCES += compat/obstack.%
THIRD_PARTY_SOURCES += compat/poll/%
THIRD_PARTY_SOURCES += compat/regex/%
THIRD_PARTY_SOURCES += sha1collisiondetection/%
--
2.23.0
Denton Liu <liu.denton@gmail.com>