Merge branch 'jt/connectivity-check-after-unshallow'
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:44 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2018 21:50:44 +0000 (14:50 -0700)
"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

1  2 
Documentation/config.txt
Documentation/technical/protocol-v2.txt
builtin/clone.c
builtin/fetch.c
fetch-pack.c
remote.c
t/t5537-fetch-shallow.sh
upload-pack.c
Simple merge
Simple merge
diff --cc builtin/clone.c
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc fetch-pack.c
index dbd879ac7fd92f370a0056593a1d633750e2f7fd,60bbffb9764fa78896cbf994360f3ab407a9ce16..7ccb9c0d45b62e6b8b40deaf296f1397d5f32ce1
@@@ -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;
diff --cc remote.c
Simple merge
Simple merge
diff --cc upload-pack.c
Simple merge