Merge branch 'ne/futz-upload-pack'

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

Conflicts:
	upload-pack.c

diff --cc upload-pack.c
index 841ebb534ac3393f5ee80692f1402c82a1b4a5f6,397cada43b95fb4e350b4c294ccd794a75a1acb2..f7d308a411d22cf350a6ac4512ee2ebb195f87d7
--- 1/upload-pack.c
--- 2/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;