From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Aug 2018 22:30:41 +0000 (-0700)
Subject: Merge branch 'jt/fetch-pack-negotiator'
X-Git-Tag: v2.19.0-rc0~106
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af8ac73801eebf0f3690c3875751eb9e108ceda8;p=git

Merge branch 'jt/fetch-pack-negotiator'

Code restructuring and a small fix to transport protocol v2 during
fetching.

* jt/fetch-pack-negotiator:
  fetch-pack: introduce negotiator API
  fetch-pack: move common check and marking together
  fetch-pack: make negotiation-related vars local
  fetch-pack: use ref adv. to prune "have" sent
  fetch-pack: directly end negotiation if ACK ready
  fetch-pack: clear marks before re-marking
  fetch-pack: split up everything_local()
---

af8ac73801eebf0f3690c3875751eb9e108ceda8
diff --cc fetch-pack.c
index 7ccb9c0d45,ba12085c4a..8fb67b0e31
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@@ -18,9 -18,7 +18,9 @@@
  #include "sha1-array.h"
  #include "oidset.h"
  #include "packfile.h"
 +#include "object-store.h"
 +#include "connected.h"
+ #include "fetch-negotiator.h"
  
  static int transfer_unpack_limit = -1;
  static int fetch_unpack_limit = -1;
diff --cc object.h
index 3afd123d73,7db4941d6d..7227b97166
--- a/object.h
+++ b/object.h
@@@ -53,8 -27,9 +53,9 @@@ struct object_array 
  
  /*
   * object flag allocation:
 - * revision.h:               0---------10                                26
 + * revision.h:               0---------10                              2526
-  * fetch-pack.c:             0----5
+  * fetch-pack.c:             01
+  * negotiator/default.c:       2--5
   * walker.c:                 0-2
   * upload-pack.c:                4       11----------------19
   * builtin/blame.c:                        12-13