Merge branch 'np/maint-1.6.3-deepen'

* np/maint-1.6.3-deepen:
  pack-objects: free preferred base memory after usage
  make shallow repository deepening more network efficient

diff --cc builtin-pack-objects.c
Simple merge

diff --cc upload-pack.c
index dacbc7614b1dc4735ca73ed067aec31463f147d0,7428ff715d7c7429c4a28bbe4cadab07963d6fea..25e222ffaac1d1a855f274d92087e6c7dfbd48b0
--- 1/upload-pack.c
--- 2/upload-pack.c
+++ b/upload-pack.c
@@@ -28,10 -28,10 +28,11 @@@ 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 struct object_array extra_edge_obj;
  static unsigned int timeout;
  /* 0 for no sideband,
   * otherwise maximum packet size (up to 65520 bytes).