Merge branch 'lt/objlist' into next

diff --git a/Makefile b/Makefile
index 99c9ec2054a54fea5abc3a584d808b0944a5db58..22bb47319ef85da330f88aa6896ab5402c193e66 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -215,7 +215,7 @@ LIB_OBJS = \
        server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
        tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
        fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
-       $(DIFF_OBJS)
+       alloc.o $(DIFF_OBJS)
 
 BUILTIN_OBJS = \
        builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \