From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Nov 2006 10:34:27 +0000 (-0800)
Subject: Merge branch 'jc/upload-pack'
X-Git-Tag: v1.5.0-rc0~235
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3fbe2d54d7d91378934df7b16d70dc5877586fae;p=git.git

Merge branch 'jc/upload-pack'

* jc/upload-pack:
  upload-pack: stop the other side when they have more roots than we do.
---

3fbe2d54d7d91378934df7b16d70dc5877586fae
diff --cc upload-pack.c
index ddaa72f0a,e8f4be373..4572fff07
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -12,18 -11,21 +12,24 @@@
  
  static const char upload_pack_usage[] = "git-upload-pack [--strict] [--timeout=nn] <dir>";
  
- #define THEY_HAVE (1U << 0)
- #define OUR_REF (1U << 1)
- #define WANTED (1U << 2)
+ /* bits #0..7 in revision.h, #8..10 in commit.c */
+ #define THEY_HAVE	(1u << 11)
+ #define OUR_REF		(1u << 12)
+ #define WANTED		(1u << 13)
+ #define COMMON_KNOWN	(1u << 14)
+ #define REACHABLE	(1u << 15)
+ 
 -static unsigned long oldest_have = 0;
++static unsigned long oldest_have;
+ 
 -static int multi_ack = 0, nr_our_refs = 0;
 -static int use_thin_pack = 0;
 +static int multi_ack, nr_our_refs;
 +static int use_thin_pack, use_ofs_delta;
  static struct object_array have_obj;
  static struct object_array want_obj;
 -static unsigned int timeout = 0;
 -static int use_sideband = 0;
 +static unsigned int timeout;
 +/* 0 for no sideband,
 + * otherwise maximum packet size (up to 65520 bytes).
 + */
 +static int use_sideband;
  
  static void reset_timeout(void)
  {