Sun, 22 Oct 2017 22:26:39 +0200

prerelease-2.14.2.windows.3.4.g3164e141fc

fixup! winansi: simplify loading the GetCurrentConsoleFontEx() function

Fri, 13 Oct 2017 17:32:32 +0200

Fix .git/ discovery at the root of UNC shares

A very common assumption in Git's source code base is that
offset_1st_component() returns either 0 for relative paths, or 1 for
absolute paths that start with a slash. In other words, the return value
is either 0 or points just after the dir separator.

This assumption is not fulfilled when calling offset_1st_component()
e.g. on UNC paths on Windows, e.g. "//my-server/my-share". In this case,
offset_1st_component() returns the length of the entire string (which is
correct, because stripping the last "component" would not result in a
valid directory), yet the return value still does not point just after a
dir separator.

This assumption is most prominently seen in the
setup_git_directory_gently_1() function, where we want to append a
".git" component and simply assume that there is already a dir
separator. In the UNC example given above, this assumption is incorrect.

As a consequence, Git will fail to handle a worktree at the top of a UNC
share correctly.

Let's fix this by adding a dir separator specifically for that case: we
found that there is no first component in the path and it does not end
in a dir separator? Then add it.

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

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

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