git, branch v2.22.0

Git 2.22

2019-06-07T16:39:21Z

Signed-off-by: Junio C Hamano

Merge tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po

2019-06-07T16:36:32Z

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 ...

Merge branch 'fr_review' of git://github.com/jnavila/git

2019-06-07T08:51:09Z

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

Merge branch 'master' of git://github.com/alshopov/git-po

2019-06-07T08:50:23Z

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

l10n: fr.po: Review French translation

2019-06-07T06:54:28Z

Signed-off-by: Cédric Malard Signed-off-by: Jean-Noel Avila

Merge branch 'en/merge-directory-renames-fix'

2019-06-06T21:03:36Z

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

l10n: de.po: Update German translation

2019-06-06T05:03:26Z

Reviewed-by: Ralf Thielow Signed-off-by: Matthias Rüster

l10n: de.po: improve description of 'git reset --quiet'

2019-06-06T05:03:25Z

Signed-off-by: Ralf Thielow

l10n: TEAMS: Change German translation team leader

2019-06-05T18:48:37Z

Acked-by: Ralf Thielow Signed-off-by: Matthias Rüster

merge-recursive: restore accidentally dropped setting of path

2019-06-05T16:30:40Z

In commit 8daec1df03de ("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: Ben Humphreys Based-on-patch-by: SZEDER Gábor Tested-by: Ben Humphreys Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano