From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Sep 2009 22:23:50 +0000 (-0700)
Subject: Merge branch 'np/maint-1.6.3-deepen'
X-Git-Tag: v1.6.5-rc0~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8e4384fd4438a143af7125eb0f03312a318319fb;p=git.git

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
---

8e4384fd4438a143af7125eb0f03312a318319fb
diff --cc upload-pack.c
index dacbc7614,7428ff715..25e222ffa
--- a/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).