Merge branch 'jk/haves-from-alternate-odb'

diff --git a/Makefile b/Makefile
index f52d84b89f25c04685be163077af5f1a3abf06e4..edd78419ff85e08b2e3f0e7c2b45654f631a9116 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -545,6 +545,7 @@ LIB_H += rerere.h
 LIB_H += resolve-undo.h
 LIB_H += revision.h
 LIB_H += run-command.h
+LIB_H += sha1-array.h
 LIB_H += sha1-lookup.h
 LIB_H += sideband.h
 LIB_H += sigchain.h
@@ -647,6 +648,7 @@ LIB_OBJS += revision.o
 LIB_OBJS += run-command.o
 LIB_OBJS += server-info.o
 LIB_OBJS += setup.o
+LIB_OBJS += sha1-array.o
 LIB_OBJS += sha1-lookup.o
 LIB_OBJS += sha1_file.o
 LIB_OBJS += sha1_name.o