From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Aug 2009 19:38:29 +0000 (-0700)
Subject: Merge branch 'ne/futz-upload-pack'
X-Git-Tag: v1.6.5-rc0~113
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d1b50981277c59a788298751f121567a1e75202;p=git.git

Merge branch 'ne/futz-upload-pack'

* ne/futz-upload-pack:
  Shift object enumeration out of upload-pack

Conflicts:
	upload-pack.c
---

7d1b50981277c59a788298751f121567a1e75202
diff --cc upload-pack.c
index 841ebb534,397cada43..f7d308a41
--- a/upload-pack.c
+++ b/upload-pack.c
@@@ -28,7 -28,8 +28,8 @@@ static unsigned long oldest_have
  
  static int multi_ack, nr_our_refs;
  static int use_thin_pack, use_ofs_delta, use_include_tag;
 -static int no_progress;
 +static int no_progress, daemon_mode;
+ static int shallow_nr;
  static struct object_array have_obj;
  static struct object_array want_obj;
  static unsigned int timeout;