summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-07-24 14:50:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-24 14:50:44 -0700
commit88df0fa6597fd32b0394c544fb37d6655bd34a13 (patch)
tree994bc28a9b8fc27ca1cf2460a8377c79e737d9f6 /git-mergetool--lib.sh
parentMerge branch 'jk/for-each-ref-icase' (diff)
parentfetch-pack: write shallow, then check connectivity (diff)
downloadtgif-88df0fa6597fd32b0394c544fb37d6655bd34a13.tar.xz
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
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions