]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/proto-v2-ref-prefix-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2022 23:09:47 +0000 (16:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Sep 2022 23:09:47 +0000 (16:09 -0700)
"git fetch" over protocol v2 sent an incorrect ref prefix request
to the server and made "git pull" with configured fetch refspec
that does not cover the remote branch to merge with fail, which has
been corrected.

* jk/proto-v2-ref-prefix-fix:
  fetch: add branch.*.merge to default ref-prefix extension
  fetch: stop checking for NULL transport->remote in do_fetch()

1  2 
builtin/fetch.c

diff --cc builtin/fetch.c
Simple merge