From: Junio C Hamano <junkio@cox.net>
Date: Mon, 11 Sep 2006 00:58:45 +0000 (-0700)
Subject: Merge branch 'jc/sideband' into jc/archive
X-Git-Tag: v1.4.3-rc1~90^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/56f9686c4d1e1d586b731b815bd98d70f84ecda4?hp=-c

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
---

56f9686c4d1e1d586b731b815bd98d70f84ecda4
diff --combined Makefile
index 4ac85fdc7b,a46cd52713..c724b481a4
--- a/Makefile
+++ b/Makefile
@@@ -232,8 -232,8 +232,8 @@@ LIB_FILE=libgit.
  XDIFF_LIB=xdiff/lib.a
  
  LIB_H = \
 -	blob.h cache.h commit.h csum-file.h delta.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 +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 \
@@@ -256,7 -256,6 +256,7 @@@
  BUILTIN_OBJS = \
  	builtin-add.o \
  	builtin-apply.o \
 +	builtin-archive.o \
  	builtin-cat-file.o \
  	builtin-checkout-index.o \
  	builtin-check-ref-format.o \
@@@ -293,7 -292,6 +293,7 @@@
  	builtin-unpack-objects.o \
  	builtin-update-index.o \
  	builtin-update-ref.o \
 +	builtin-upload-archive.o \
  	builtin-upload-tar.o \
  	builtin-verify-pack.o \
  	builtin-write-tree.o \