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

diff --cc Makefile
Simple merge

diff --cc fetch-pack.c
index 7ccb9c0d45b62e6b8b40deaf296f1397d5f32ce1,ba12085c4ade41ca6d8eee7374c0daa2d5fa1f7d..8fb67b0e31e82ed5f0daeb1dec10ca7a04e4321f
--- 1/fetch-pack.c
--- 2/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 3afd123d735d1d5ac45da096e889d00f0b901161,7db4941d6dd7b84b727528af9d8e326383fe4e10..7227b9716672dd15e60e3f1a953f02cbb1f7e14a
--- 1/object.h
--- 2/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

diff --cc t/t5500-fetch-pack.sh
Simple merge