From: Junio C Hamano <junkio@cox.net>
Date: Wed, 21 Jun 2006 09:50:59 +0000 (-0700)
Subject: Merge branch 'jc/upload-corrupt' into next
X-Git-Tag: v1.4.1-rc1~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3bec0da08d6df03a103ddc4237cf2c79992c7dd4;p=git.git

Merge branch 'jc/upload-corrupt' into next

* jc/upload-corrupt:
  upload-pack/fetch-pack: support side-band communication
  Retire git-clone-pack
  upload-pack: prepare for sideband message support.
  upload-pack: avoid sending an incomplete pack upon failure
  Fix possible out-of-bounds array access
---

3bec0da08d6df03a103ddc4237cf2c79992c7dd4
diff --cc Makefile
index 22bb47319,ae5e8d790..de7614174
--- a/Makefile
+++ b/Makefile
@@@ -148,10 -149,10 +148,10 @@@ SIMPLE_PROGRAMS = 
  
  # ... and all the rest that could be moved out of bindir to gitexecdir
  PROGRAMS = \
- 	git-checkout-index$X git-clone-pack$X \
+ 	git-checkout-index$X \
  	git-convert-objects$X git-fetch-pack$X git-fsck-objects$X \
  	git-hash-object$X git-index-pack$X git-local-fetch$X \
 -	git-mailinfo$X git-merge-base$X \
 +	git-merge-base$X \
  	git-merge-index$X git-mktag$X git-mktree$X git-pack-objects$X git-patch-id$X \
  	git-peek-remote$X git-prune-packed$X git-receive-pack$X \
  	git-send-pack$X git-shell$X \