Merge branch 'jt/fetch-pack-negotiator'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:41 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:41 +0000 (15:30 -0700)
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()

1  2 
Makefile
fetch-pack.c
object.h
t/t5500-fetch-pack.sh

diff --cc Makefile
Simple merge
diff --cc 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
+++ 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
Simple merge