From: Junio C Hamano <junkio@cox.net>
Date: Mon, 20 Feb 2006 08:45:38 +0000 (-0800)
Subject: Merge branch 'jc/pack-thin' into next
X-Git-Tag: v1.3.0-rc1~54^2~52
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5be4eabf90a4f6d14d3ae16772e6b2e063d71587;p=git.git

Merge branch 'jc/pack-thin' into next

* jc/pack-thin:
  Use thin pack transfer in "git fetch".
  Add git-push --thin.
---

5be4eabf90a4f6d14d3ae16772e6b2e063d71587
diff --cc upload-pack.c
index 3606529f6,3cdf4288b..635abb371
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -213,12 -218,9 +218,12 @@@ static int receive_needs(void
  
  static int send_ref(const char *refname, const unsigned char *sha1)
  {
- 	static char *capabilities = "multi_ack";
+ 	static char *capabilities = "multi_ack thin-pack";
  	struct object *o = parse_object(sha1);
  
 +	if (!o)
 +		die("git-upload-pack: cannot find object %s:", sha1_to_hex(sha1));
 +
  	if (capabilities)
  		packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
  			0, capabilities);