summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-30 06:51:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-30 06:51:22 (GMT)
commit01f9ffbd5d3f480c9a524780d86fa0d4134841af (patch)
tree40a47451f2a72180a1497fca3ac157ff1f114226 /Makefile
parenta9930e359c45302f92639e8cd0a61c9c912e0b22 (diff)
parentcff38a5e11217dc997c1ffae8d0856023e05554a (diff)
downloadgit-01f9ffbd5d3f480c9a524780d86fa0d4134841af.zip
git-01f9ffbd5d3f480c9a524780d86fa0d4134841af.tar.gz
git-01f9ffbd5d3f480c9a524780d86fa0d4134841af.tar.bz2
Merge branch 'jk/haves-from-alternate-odb'
* jk/haves-from-alternate-odb: receive-pack: eliminate duplicate .have refs bisect: refactor sha1_array into a generic sha1 list refactor refs_from_alternate_cb to allow passing extra data
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index f52d84b..edd7841 100644
--- 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