]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jc/sideband' into jc/archive
authorJunio C Hamano <junkio@cox.net>
Mon, 11 Sep 2006 00:58:45 +0000 (17:58 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 11 Sep 2006 00:58:45 +0000 (17:58 -0700)
* 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

1  2 
Makefile

diff --cc Makefile
index 4ac85fdc7b1585746fbdb11bdcbfda3b70467085,a46cd52713a7adfccbb240f6696b20c1ce7bc370..c724b481a4426ed3336c12289eafdcb581c09e42
+++ 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