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

diff --cc Makefile
index 22bb47319ef85da330f88aa6896ab5402c193e66,ae5e8d790a8b148b95cfce03afab94e97315110a..de7614174215feaafb20bdaa350b916e76f7cc43
--- 1/Makefile
--- 2/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 \

diff --cc builtin-grep.c
Simple merge