diff options
author | Junio C Hamano <junkio@cox.net> | 2006-09-10 17:58:45 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-09-10 17:58:45 -0700 |
commit | 56f9686c4d1e1d586b731b815bd98d70f84ecda4 (patch) | |
tree | c460f363a9be3a5db40363ef20c82ed158a39ca1 /Makefile | |
parent | fe5ab763f848cfcda22001f9280625f06c4c3760 (diff) | |
parent | d47f3db75c58139cdcbca5cc63b17bf5db293b6a (diff) | |
download | git-56f9686c4d1e1d586b731b815bd98d70f84ecda4.tar.gz git-56f9686c4d1e1d586b731b815bd98d70f84ecda4.tar.xz |
Merge branch 'jc/sideband' into jc/archive
* jc/sideband:
Prepare larger packet buffer for upload-pack protocol.
Move sideband server side support into reusable form.
Move sideband client side support into reusable form.
get_sha1_hex() micro-optimization
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -233,7 +233,7 @@ XDIFF_LIB=xdiff/lib.a LIB_H = \ archive.h blob.h cache.h commit.h csum-file.h delta.h \ - diff.h object.h pack.h pkt-line.h quote.h refs.h \ + diff.h object.h pack.h pkt-line.h quote.h refs.h sideband.h \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h @@ -245,7 +245,7 @@ DIFF_OBJS = \ LIB_OBJS = \ blob.o commit.o connect.o csum-file.o cache-tree.o base85.o \ date.o diff-delta.o entry.o exec_cmd.o ident.o lockfile.o \ - object.o pack-check.o patch-delta.o path.o pkt-line.o \ + object.o pack-check.o patch-delta.o path.o pkt-line.o sideband.o \ quote.o read-cache.o refs.o run-command.o dir.o object-refs.o \ 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 \ |