git, branch v2.17.0-rc2

Git 2.17-rc2

2018-03-28T18:05:14Z

Signed-off-by: Junio C Hamano

Merge branch 'tg/stash-doc-typofix'

2018-03-28T18:04:25Z

Hotfix. * tg/stash-doc-typofix: git-stash.txt: remove extra square bracket

Merge branch 'pc/submodule-helper'

2018-03-28T18:04:25Z

Hotfix. * pc/submodule-helper: submodule deinit: handle non existing pathspecs gracefully

Merge branch 'nd/parseopt-completion'

2018-03-28T18:04:24Z

Hotfix for recently graduated topic that give help to completion scripts from the Git subcommands that are being completed * nd/parseopt-completion: t9902: disable test on the list of merge-strategies under GETTEXT_POISON completion: clear cached --options when sourcing the completion script

submodule deinit: handle non existing pathspecs gracefully

2018-03-28T05:07:13Z

This fixes a regression introduced in 2e612731b5 (submodule: port submodule subcommand 'deinit' from shell to C, 2018-01-15), when handling pathspecs that do not exist gracefully. This restores the historic behavior of reporting the pathspec as unknown and returning instead of reporting a bug. Reported-by: Peter Oberndorfer Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

git-stash.txt: remove extra square bracket

2018-03-28T02:09:13Z

In 1ada5020b3 ("stash: use stash_push for no verb form", 2017-02-28), when the pathspec argument was introduced in 'git stash', that was also documented. However I forgot to remove an extra square bracket after the '--message' argument, even though the square bracket should have been after the pathspec argument (where it was also added). Remove the extra square bracket after the '--message' argument, to show that the pathspec argument should be used with the 'push' verb. While the pathspec argument can be used without the push verb, that's a special case described later in the man page, and removing the first extra square bracket instead of the second one makes the synopis easier to understand. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

t9902: disable test on the list of merge-strategies under GETTEXT_POISON

2018-03-23T18:27:52Z

The code to learn the list of merge strategies from the output of "git merge -s help" forces C locale, so that it can notice the message shown to indicate where the list starts in the output. However, GETTEXT_POISON build corrupts its output even when run in the C locale, and we cannot expect this test to succeed. Signed-off-by: Junio C Hamano

Sync with Git 2.16.3

2018-03-22T21:36:51Z

Git 2.16.3

2018-03-22T21:24:45Z

Signed-off-by: Junio C Hamano

Merge branch 'ms/non-ascii-ticks' into maint

2018-03-22T21:24:26Z

Doc markup fix. * ms/non-ascii-ticks: Documentation/gitsubmodules.txt: avoid non-ASCII apostrophes