git/diff.c, branch v2.23.2

Merge branch 'js/unmap-before-ext-diff'

2019-07-25T20:59:21Z

Windows update. * js/unmap-before-ext-diff: diff: munmap() file contents before running external diff

range-diff: suppress line count in outer diff

2019-07-11T21:29:27Z

The line count in the outer diff's hunk headers of a range diff is not all that interesting. It merely shows how far along the inner diff are on both sides. That number is of no use for human readers, and range-diffs are not meant to be machine readable. In a subsequent commit we're going to add some more contextual information such as the filename corresponding to the diff to the hunk headers. Remove the unnecessary information, and just keep the "@@" to indicate that a new hunk of the outer diff is starting. Signed-off-by: Thomas Gummerer Signed-off-by: Junio C Hamano

diff: munmap() file contents before running external diff

2019-07-11T19:11:54Z

When running an external diff from, say, a diff tool, it is safe to assume that we want to write the files in question. On Windows, that means that there cannot be any other process holding an open handle to said files, or even just a mapped region. So let's make sure that `git diff` itself is not holding any open handle to the files in question. In fact, we will just release the file pair right away, as the external diff uses the files we just wrote, so we do not need to hold the file contents in memory anymore. This fixes https://github.com/git-for-windows/git/issues/1315 Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'sb/format-patch-base-patch-id-fix'

2019-06-13T20:18:46Z

The "--base" option of "format-patch" computed the patch-ids for prerequisite patches in an unstable way, which has been updated to compute in a way that is compatible with "git patch-id --stable". * sb/format-patch-base-patch-id-fix: format-patch: make --base patch-id output stable format-patch: inform user that patch-id generation is unstable

i18n: fix typos found during l10n for git 2.22.0

2019-06-03T18:10:53Z

Fix two typos introduced by the following commits: + 31fba9d3b4 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24) + ed8b4132c8 (remote-curl: mark all error messages for translation, 2019-03-05) Signed-off-by: Jiang Xin Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'ja/diff-opt-typofix'

2019-05-30T17:50:46Z

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

Merge branch 'nd/diff-parseopt'

2019-05-30T17:50:44Z

A brown-paper-bag bugfix to a change already in 'master'. * nd/diff-parseopt: parse-options: check empty value in OPT_INTEGER and OPT_ABBREV diff-parseopt: restore -U (no argument) behavior diff-parseopt: correct variable types that are used by parseopt

diff-parseopt: restore -U (no argument) behavior

2019-05-29T18:04:32Z

Before d473e2e0e8 (diff.c: convert -U|--unified, 2019-01-27), -U and --unified are implemented with a custom parser opt_arg() in diff.c. I didn't check this code carefully and not realize that it's the equivalent of PARSE_OPT_NONEG | PARSE_OPT_OPTARG. In other words, if -U is specified without any argument, the option should be accepted, and the default value should be used. Without PARSE_OPT_OPTARG, parse_options() will reject this case and cause a regression. Reported-by: Bryan Turner Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

diff: fix mistake in translatable strings

2019-05-19T02:01:02Z

Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano

format-patch: make --base patch-id output stable

2019-05-08T10:27:43Z

We weren't flushing the context each time we processed a hunk in the patch-id generation code in diff.c, but we were doing that when we generated "stable" patch-ids with the 'patch-id' tool. Let's port that similar logic over from patch-id.c into diff.c so we can get the same hash when we're generating patch-ids for 'format-patch --base=' types of command invocations. Cc: Xiaolong Ye Signed-off-by: Stephen Boyd Signed-off-by: Junio C Hamano