From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:44 +0000 (-0700)
Subject: Merge branch 'jt/connectivity-check-after-unshallow'
X-Git-Tag: v2.19.0-rc0~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/88df0fa6597fd32b0394c544fb37d6655bd34a13

Merge branch 'jt/connectivity-check-after-unshallow'

"git fetch" failed to correctly validate the set of objects it
received when making a shallow history deeper, which has been
corrected.

* jt/connectivity-check-after-unshallow:
fetch-pack: write shallow, then check connectivity
fetch-pack: implement ref-in-want
fetch-pack: put shallow info in output parameter
fetch: refactor to make function args narrower
fetch: refactor fetch_refs into two functions
fetch: refactor the population of peer ref OIDs
upload-pack: test negotiation with changing repository
upload-pack: implement ref-in-want
test-pkt-line: add unpack-sideband subcommand
---

88df0fa6597fd32b0394c544fb37d6655bd34a13
diff --cc fetch-pack.c
index dbd879ac7f,60bbffb976..7ccb9c0d45
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@@ -19,7 -19,7 +19,8 @@@
  #include "sha1-array.h"
  #include "oidset.h"
  #include "packfile.h"
 +#include "object-store.h"
+ #include "connected.h"
  
  static int transfer_unpack_limit = -1;
  static int fetch_unpack_limit = -1;