Sun, 26 Nov 2017 00:26:52 +0100

Merge pull request #1372 from atetubou/enable_fscache_fetch

enable fscache while iterating every local refs

Thu, 9 Nov 2017 18:32:49 +0100

prerelease-2.15.0.windows.1.11.g8ce23d0a3b

Merge pull request #1354 from dscho/phase-out-show-ignored-directory-…

Thu, 2 Nov 2017 17:57:49 +0100

fixup! status: offer *not* to lock the index and update it

This re-adds the regression test that would have found the issue before
releasing v2.15.0 *grrrr*.

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

Wed, 1 Nov 2017 23:05:16 +0100

prerelease-2.15.0.windows.1.4.gfe8b815da3

Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fs…

Tue, 31 Oct 2017 17:10:08 +0100

squash! msvc: fix `make MSVC=1 install`

Noticed by Derrick Stolee.

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

Tue, 31 Oct 2017 17:06:46 +0100

msvc: fix `make MSVC=1 install`

We used to install into $HOME/bin/, which wreaks havoc with installed
versions of Git for Windows (because $HOME/bin is *prepended* to the
PATH, hence would override `git.exe` in Git Bash).

Let's align the MSVC case with the non-MSVC case and install into
/mingw64/bin/ (or /mingw32/bin/ in 32-bit Git for Windows SDKs) instead.

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

Sun, 29 Oct 2017 16:53:00 +0100

Merge branch 'jm/status-ignored-files-list'

This is an early version of the latest iteration of what used to
be 08f088c8098 (Merge branch 'show-ignored-directory', 2017-10-23),
i.e.  support for the then-experimental, now-dropped
`--show-ignored-directory` option.

The set of paths output from "git status --ignored" was tied
closely with its "--untracked=<mode>" option, but now it can be
controlled more flexibly.  Most notably, a directory that is
ignored because it is listed to be ignored in the ignore/exclude
mechanism can be handled differently from a directory that ends up
to be ignored only because all files in it are ignored.

* jm/status-ignored-files-list:
  status: test ignored modes
  status: document options to show matching ignored files
  status: report matching ignored and normal untracked
  status: add option to show ignored files differently

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

Sat, 28 Oct 2017 17:19:39 +0200

Merge pull request #1334 from max630/mingw-direct-CreateHardLinkW

mingw: use CreateHardLink directly

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