Tue, 27 Feb 2018 02:13:00 +0100

Merge branch 'fix-terminal-prompt'

This fixes the issue identified in

	https://github.com/git-for-windows/git/issues/1498

where Git would not fall back to reading credentials from a Win32
Console when the credentials could not be read from the terminal via the
Bash hack (that is necessary to support running in a MinTTY).

Tested in a Powershell window.

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

Tue, 27 Feb 2018 16:23:43 +0100

fixup! checkout.c: enable fscache for checkout again

These changes are needed to make Git build with DEVELOPER=1 again.

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

Tue, 27 Feb 2018 13:48:15 +0100

Merge pull request #1468 from atetubou/fscache_checkout_flush

checkout.c: enable fscache for checkout again

Tue, 20 Feb 2018 15:44:57 +0100

.github: Add configuration for the Sentiment Bot

The sentiment bot will help detect when things get too heated.
Hopefully.

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

Fri, 16 Feb 2018 23:00:50 +0100

prerelease-2.16.1.windows.4.392.ge1848984d1

fixup! tests: move test PNGs into t/diff-lib/

Mon, 12 Feb 2018 17:23:42 +0100

add --edit: truncate the patch file

If there is already a .git/ADD_EDIT.patch file, we fail to truncate it
properly, which could result in very funny errors.

Let's just truncate it and not worry about it too much.

Reported by J Wyman.

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

Wed, 7 Feb 2018 18:20:35 +0100

Merge branch 'inherit-only-stdhandles-fixup'

Some more changes to fix a real bug affecting TortoiseGit users, and to
make the code a bit more robust in general.

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

Mon, 22 Jan 2018 14:28:01 +0100

fixup! checkout.c: enable fscache for checkout_entry

The recently introduced speedup of `git checkout` sadly introduced a
regression: after writing a file, the cached stat data is obviously
incorrect, yet we still used it!

This patch simply reverts the original speedup (as opposed to try to
hotfix it as https://github.com/git-for-windows/git/pull/1443 tries to
do), and marks it as a fixup commit so that the next merging-rebase will
drop the patch.

We will most likely want to speed up this code path, though, but may
find a better way, e.g. by invalidating the cached data cleverly. (This
will be a *little* tricky, though, as readdir() uses the data, and we
must ensure that we do not pull it under readdir()'s rag when
invalidating it, and we also must avoid re-caching for every written
file, as that would be *even* slower than fscache=false.)

This fixes https://github.com/git-for-windows/git/issues/1438 and
https://github.com/git-for-windows/git/issues/1442

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

Wed, 17 Jan 2018 19:43:01 +0100

Merge pull request #1427 from atetubou/reset_fscache

reset.c: enable fscache

Wed, 17 Jan 2018 21:39:11 +0100

packed_ref_cache: don't use mmap() for small files

Take a hint from commit ea68b0ce9f8 (hash-object: don't use mmap() for
small files, 2010-02-21) and use read() instead of mmap() for small
packed-refs files.

This also fixes https://github.com/git-for-windows/git/issues/1410
(where xmmap() returns NULL for zero length[1], for which munmap() later
fails).

Alternatively, we could simply check for NULL before munmap(), or
introduce xmunmap() that could be used together with xmmap(). However,
always setting snapshot->buf to a valid pointer, by relying on
xmalloc(0)'s fallback to 1-byte allocation, makes using snapshots
easier.

[1] Logic introduced in commit 9130ac1e196 (Better error messages for
    corrupt databases, 2007-01-11)

This was cherry-picked from upstream's `pu` branch so that the fix is
included in Git for Windows v2.16.0.

Signed-off-by: Kim Gybels <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>