summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-29 17:09:27 -0700
committerJunio C Hamano <gitster@pobox.com>2011-06-29 17:09:27 -0700
commit55ac692661f7b850bb0160de18fa9868d24dbe17 (patch)
tree61559a2f9a0964462b948c4dc70d11eeeb7d0e5c /Makefile
parent61f44720a9c360dd30053a558e58c8a41d6f3843 (diff)
parent23c7df6bdd13e3d99ca09b6a7655747cc29ccc41 (diff)
downloadgit-55ac692661f7b850bb0160de18fa9868d24dbe17.tar.gz
Merge branch 'jc/streaming' into next
* jc/streaming: sha1_file: use the correct type (ssize_t, not size_t) for read-style function streaming: read loose objects incrementally sha1_file.c: expose helpers to read loose objects streaming: read non-delta incrementally from a pack streaming_write_entry(): support files with holes convert: CRLF_INPUT is a no-op in the output codepath streaming_write_entry(): use streaming API in write_entry() streaming: a new API to read from the object store write_entry(): separate two helper functions out unpack_object_header(): make it public sha1_object_info_extended(): hint about objects in delta-base cache sha1_object_info_extended(): expose a bit more info packed_object_info_detail(): do not return a string
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e40ac0c7f5..f8c72e10a0 100644
--- a/Makefile
+++ b/Makefile
@@ -556,6 +556,7 @@ LIB_H += sha1-lookup.h
LIB_H += sideband.h
LIB_H += sigchain.h
LIB_H += strbuf.h
+LIB_H += streaming.h
LIB_H += string-list.h
LIB_H += submodule.h
LIB_H += tag.h
@@ -662,6 +663,7 @@ LIB_OBJS += shallow.o
LIB_OBJS += sideband.o
LIB_OBJS += sigchain.o
LIB_OBJS += strbuf.o
+LIB_OBJS += streaming.o
LIB_OBJS += string-list.o
LIB_OBJS += submodule.o
LIB_OBJS += symlinks.o