Thu, 12 Oct 2017 21:58:03 +0200

Merge branch 'mingw/fixup-ref-filter-remote-name'

These fixups/squashes reflect the changes accumulated so far after
submitting v2 of the ref-filter-remote-name patch series to the Git
mailing list.

Signed-off-by: Johannes Schindelin <[email protected]>

Thu, 5 Oct 2017 15:05:25 +0200

prerelease-2.14.2.windows.1.9.g34c1a976dc

fixup! diff: munmap() file contents before running external diff

Thu, 5 Oct 2017 11:50:32 +0200

diff: munmap() file contents before running external diff

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.

So let's make sure that `git diff` itself is not holding any open handle
to the files in question.

This fixes https://github.com/git-for-windows/git/issues/1315

Signed-off-by: Johannes Schindelin <[email protected]>

Wed, 4 Oct 2017 16:30:17 +0200

fixup! http: add support for selecting SSL backends at runtime

Noticed by clang...

Wed, 20 Sep 2017 21:57:33 +0200

Merge branch 'git-gui-askyesno'

These changes are necessary to support better Git for Windows' new
auto-update feature.

Signed-off-by: Johannes Schindelin <[email protected]>

Mon, 18 Sep 2017 15:32:04 +0200

Merge pull request #1302 from jeffhostetler/vs2017_vcxproj

VS2017 vcxproj

Tue, 5 Sep 2017 21:40:10 +0200

Merge branch 'core-longpaths-everywhere'

Git for Windows supports the core.longPaths config setting to allow
writing/reading long paths via the \\?\ trick for a long time now.

However, for that support to work, it is absolutely necessary that
git_default_config() is given a chance to parse the config. Otherwise
Git will be non the wiser.

So let's make sure that as many commands that previously failed to
parse the core.* settings now do that, implicitly enabling long path
support in a lot more places.

Note: this is not a perfect solution, and it cannot be, as there is
a chicken-and-egg problem in reading the config itself...

This fixes https://github.com/git-for-windows/git/issues/1218

Signed-off-by: Johannes Schindelin <[email protected]>

Mon, 28 Aug 2017 23:33:07 +0200

fixup! mingw: add a Makefile target to copy test artifacts

We need two more files to pass the test suite in BusyBox-backed MinGit.

Signed-off-by: Johannes Schindelin <[email protected]>

Sat, 26 Aug 2017 22:00:59 +0200

fixup! mingw: add a Makefile target to copy test artifacts

We still need to create the mingw$ARCH/bin directory for git-daemon.exe
and git-http-backend.exe, and the mingw$ARCH/libexec/git-core directory
for git-remote-testgit.

Signed-off-by: Johannes Schindelin <[email protected]>

Fri, 25 Aug 2017 12:07:39 +0200

Revert "fixup! gc/repack: release packs when needed"

The packfile.h file only exists in `pu` so far...

This reverts commit b4219bb25ad7d94c352160e5e7ec8b0abf6dcf5a.

Signed-off-by: Johannes Schindelin <[email protected]>