The return type of the `GetProcAddress()` function is `FARPROC` which
evaluates to `long long int (*)()`, i.e. it cannot be cast to the
correct function signature by GCC 8.

To work around that, we first cast to `void *` and go on with our merry
lives.
Signed-off-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

l10n-2.22.0-rnd3

* tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po: (25 commits)
  l10n: fr.po: Review French translation
  l10n: de.po: Update German translation
  l10n: de.po: improve description of 'git reset --quiet'
  l10n: TEAMS: Change German translation team leader
  l10n: bg.po: Updated Bulgarian translation (4581t)
  l10n: zh_CN: Revision for git v2.22.0 l10n
  l10n: zh_CN: for git v2.22.0 l10n round 1~3
  l10n: es: 2.22.0 round 3
  l10n: it.po: Updated Italian translation
  l10n: fr v2.22.0 rnd 3
  l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3
  l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed)
  l10n: es: 2.22.0 round 2
  l10n: bg.po: Updated Bulgarian translation (4580t)
  l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2
  l10n: fr.po v2.22.0 round 2
  l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed)
  l10n: bg.po: Updated Bulgarian translation (4577t)
  l10n: es: 2.22.0 round 1
  l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1
  ...

* 'fr_review' of git://github.com/jnavila/git:
  l10n: fr.po: Review French translation

* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4581t)

Signed-off-by: NCédric Malard <c.malard-git@valdun.net>
Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>

Recent code restructuring of merge-recursive engine introduced a
regression dealing with rename/add conflict.

* en/merge-directory-renames-fix:
  merge-recursive: restore accidentally dropped setting of path

Reviewed-by: NRalf Thielow <ralf.thielow@gmail.com>
Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com>

Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>

Acked-by: NRalf Thielow <ralf.thielow@gmail.com>
Signed-off-by: NMatthias Rüster <matthias.ruester@gmail.com>

In commit 8daec1df ("merge-recursive: switch from (oid,mode) pairs
to a diff_filespec", 2019-04-05), we actually switched from
(oid,mode,path) triplets to a diff_filespec -- but most callsites in the
patch only needed to worry about oid and mode so the commit message
focused on that.  The oversight in the commit message apparently spilled
over to the code as well; one of the dozen or so callsites accidentally
dropped the setting of the path in the conversion.  Restore the path
setting in that location.

Also, this pointed out that our testsuite was lacking a good rename/add
test, at least one that involved the need for merge content with the
rename.  Add such a test, and since rename/add vs. add/rename could
possibly be important, redo the merge the opposite direction to make
sure we don't have issues with the direction of the merge.  These
testcases failed before restoring the setting of path, but with the
paths appropriately set the testcases both pass.
Reported-by: NBen Humphreys <behumphreys@atlassian.com>
Based-on-patch-by: NSZEDER Gábor <szeder.dev@gmail.com>
Tested-by: NBen Humphreys <behumphreys@atlassian.com>
Signed-off-by: NElijah Newren <newren@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NAlexander Shopov <ash@kambanaria.org>

Revise 51 translations, improving consistency for some phrased.
Update email address for Fangyi Zhou
Signed-off-by: NFangyi Zhou <me@fangyi.io>
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

Translate 274 new messages (4581t0f0u) for git 2.22.0.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* '2.22' of https://github.com/ChrisADR/git-po:
  l10n: es: 2.22.0 round 3

* 'it-l10n-wip' of github.com:AlessandroMenti/git-po:
  l10n: it.po: Updated Italian translation

Signed-off-by: NChristopher Diaz Riveros <chrisadr@gentoo.org>

Signed-off-by: NAlessandro Menti <alessandro.menti@alessandromenti.it>

Signed-off-by: NJean-Noël Avila <jn.avila@free.fr>

Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://git.kernel.org/pub/scm/git/git:
  Git 2.22-rc3
  i18n: fix typos found during l10n for git 2.22.0
  RelNotes: minor typo fixes in 2.22.0 draft
  list-objects-filter: disable 'sparse:path' filters

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Disable "--filter=sparse:path=<path>" that would allow reading from
paths on the filesystem.

* cc/list-objects-filter-wo-sparse-path:
  list-objects-filter: disable 'sparse:path' filters

Fix two typos introduced by the following commits:

+ 31fba9d3 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24)
+ ed8b4132 (remote-curl: mark all error messages for translation,
  2019-03-05)
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
Acked-by: NJohannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NTodd Zullinger <tmz@pobox.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NChristopher Diaz Riveros <chrisadr@gentoo.org>

* 'master' of https://github.com/vnwildman/git:
  l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2

* 'master' of git://github.com/alshopov/git-po:
  l10n: bg.po: Updated Bulgarian translation (4580t)

Signed-off-by: NAlexander Shopov <ash@kambanaria.org>

Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

Signed-off-by: NJean-Noël Avila <jn.avila@free.fr>

Generate po/git.pot from v2.22.0-rc2 for git v2.22.0 l10n round 2.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
  Git 2.22-rc2
  ...

* 'master' of https://github.com/Softcatala/git-po:
  l10n: Update Catalan translation

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* js/rebase-config-bitfix:
  rebase: replace incorrect logical negation by correct bitwise one

Doc markup fix.

* es/doc-gitsubmodules-markup:
  gitsubmodules: align html and nroff lists

Typofix.

* ja/diff-opt-typofix:
  diff: fix mistake in translatable strings

A brown-paper-bag bugfix to a change already in 'master'.

* jt/clone-server-option:
  fetch-pack: send server options after command