Merge branch 'tg/t0021-racefix'

diff --git a/Makefile b/Makefile
index f9255344ae5009a192ab83a332be749632d94531..ad71ae12194e1d27f2adcd4014d0048ee4a5ebcd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -965,6 +965,7 @@ LIB_OBJS += refspec.o
 LIB_OBJS += ref-filter.o
 LIB_OBJS += remote.o
 LIB_OBJS += replace-object.o
+LIB_OBJS += repo-settings.o
 LIB_OBJS += repository.o
 LIB_OBJS += rerere.o
 LIB_OBJS += resolve-undo.o