Commit Graph

109047 Commits

Author SHA1 Message Date
Jeff Hostetler
fa76cb8faa fscache: add key for GIT_TRACE_FSCACHE
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:14 +02:00
Karsten Blees
0e9a5374cc fscache: load directories only once
If multiple threads access a directory that is not yet in the cache, the
directory will be loaded by each thread. Only one of the results is added
to the cache, all others are leaked. This wastes performance and memory.

On cache miss, add a future object to the cache to indicate that the
directory is currently being loaded. Subsequent threads register themselves
with the future object and wait. When the first thread has loaded the
directory, it replaces the future object with the result and notifies
waiting threads.

Signed-off-by: Karsten Blees <blees@dcon.de>
2020-04-20 16:50:14 +02:00
Karsten Blees
af9c2fce14 mingw: add a cache below mingw's lstat and dirent implementations
Checking the work tree status is quite slow on Windows, due to slow
`lstat()` emulation (git calls `lstat()` once for each file in the
index). Windows operating system APIs seem to be much better at scanning
the status of entire directories than checking single files.

Add an `lstat()` implementation that uses a cache for lstat data. Cache
misses read the entire parent directory and add it to the cache.
Subsequent `lstat()` calls for the same directory are served directly
from the cache.

Also implement `opendir()`/`readdir()`/`closedir()` so that they create
and use directory listings in the cache.

The cache doesn't track file system changes and doesn't plug into any
modifying file APIs, so it has to be explicitly enabled for git functions
that don't modify the working copy.

Note: in an earlier version of this patch, the cache was always active and
tracked file system changes via ReadDirectoryChangesW. However, this was
much more complex and had negative impact on the performance of modifying
git commands such as 'git checkout'.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:14 +02:00
Karsten Blees
570325f18a add infrastructure for read-only file system level caches
Add a macro to mark code sections that only read from the file system,
along with a config option and documentation.

This facilitates implementation of relatively simple file system level
caches without the need to synchronize with the file system.

Enable read-only sections for 'git status' and preload_index.

Signed-off-by: Karsten Blees <blees@dcon.de>
2020-04-20 16:50:14 +02:00
Karsten Blees
69661bfa5f Win32: make the lstat implementation pluggable
Emulating the POSIX lstat API on Windows via GetFileAttributes[Ex] is quite
slow. Windows operating system APIs seem to be much better at scanning the
status of entire directories than checking single files. A caching
implementation may improve performance by bulk-reading entire directories
or reusing data obtained via opendir / readdir.

Make the lstat implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:14 +02:00
Karsten Blees
0484dfbad1 mingw: make the dirent implementation pluggable
Emulating the POSIX `dirent` API on Windows via
`FindFirstFile()`/`FindNextFile()` is pretty staightforward, however,
most of the information provided in the `WIN32_FIND_DATA` structure is
thrown away in the process. A more sophisticated implementation may
cache this data, e.g. for later reuse in calls to `lstat()`.

Make the `dirent` implementation pluggable so that it can be switched at
runtime, e.g. based on a config option.

Define a base DIR structure with pointers to `readdir()`/`closedir()`
that match the `opendir()` implementation (similar to vtable pointers in
Object-Oriented Programming). Define `readdir()`/`closedir()` so that
they call the function pointers in the `DIR` structure. This allows to
choose the `opendir()` implementation on a call-by-call basis.

Make the fixed-size `dirent.d_name` buffer a flex array, as `d_name` may
be implementation specific (e.g. a caching implementation may allocate a
`struct dirent` with _just_ the size needed to hold the `d_name` in
question).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:14 +02:00
Karsten Blees
1238231afe Win32: dirent.c: Move opendir down
Move opendir down in preparation for the next patch.

Signed-off-by: Karsten Blees <blees@dcon.de>
2020-04-20 16:50:13 +02:00
Karsten Blees
ea734d0279 Win32: make FILETIME conversion functions public
We will use them in the upcoming "FSCache" patches (to accelerate
sequential lstat() calls).

Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:13 +02:00
Jeff Hostetler
77bf83fd37 Merge pull request #2589 from jeffhostetler/unlink-perf-gfw
mingw: improve performance of mingw_unlink()
2020-04-20 16:50:11 +02:00
Johannes Schindelin
d4d18931b3 Merge pull request #2549 from remybohmer/master
[fix] Gitk fails to open on a bare Git repository on Windows
2020-04-20 16:50:10 +02:00
Johannes Schindelin
2374ebf562 Merge pull request #2577 from dscho/github-action+musl
Add a CI/PR workflow based on GitHub Actions
2020-04-20 16:50:10 +02:00
Johannes Schindelin
b68441f3a7 Merge pull request #2574 from rimrul/ucrt-strftime
mingw: use modern strftime implementation if possible
2020-04-20 16:50:10 +02:00
Johannes Schindelin
27ae88dab3 Merge branch 'subtree-and-docbook'
This patch pulls `contrib/subtree` on par with the AsciiDoctor 2 fixes
done to `Documentation/`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:09 +02:00
Johannes Schindelin
9732739a77 Merge pull request #2535 from dscho/schannel-revoke-best-effort
Introduce and use the new "best effort" strategy for Secure Channel revoke checking
2020-04-20 16:50:09 +02:00
Johannes Schindelin
a23cf152e7 Merge pull request #2516 from nyckyta/crlf-aware-git-credential
credential.c: fix credential reading with regards to CR/LF
2020-04-20 16:50:09 +02:00
Johannes Schindelin
c537387d73 Merge pull request #2506 from dscho/issue-2283
Allow running Git directly from `C:\Program Files\Git\mingw64\bin\git.exe`
2020-04-20 16:50:08 +02:00
Johannes Schindelin
85ff95d560 Merge pull request #2504 from dscho/access-repo-via-junction
Handle `git add <file>` where <file> traverses an NTFS junction
2020-04-20 16:50:08 +02:00
Johannes Schindelin
999879eca8 Merge pull request #2501 from jeffhostetler/clink-debug-curl
clink.pl: fix MSVC compile script to handle libcurl-d.lib
2020-04-20 16:50:08 +02:00
Johannes Schindelin
215020b49c Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2020-04-20 16:50:08 +02:00
Johannes Schindelin
b79a8f0a6d Merge pull request #2473 from dscho/com0-is-not-a-reserved-name
Do not mistake `COM0` for a reserved file name
2020-04-20 16:50:07 +02:00
Johannes Schindelin
b3b1995bd0 Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks
Do resolve symlinks in `getcwd()`
2020-04-20 16:50:07 +02:00
Johannes Schindelin
20bb38d9be Merge pull request #2405 from dscho/mingw-setsockopt
Make sure `errno` is set when socket operations fail
2020-04-20 16:50:07 +02:00
Johannes Schindelin
5b44807dc5 Merge pull request #2375 from assarbad/reintroduce-sideband-config
Config option to disable side-band-64k for transport
2020-04-20 16:50:06 +02:00
Johannes Schindelin
8a0d4b5118 Merge branch 'msys2-python'
In MSYS2, we have two Python interpreters at our disposal, so we can
include the Python stuff in the build.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:06 +02:00
Johannes Schindelin
eaf0056fee Merge branch 'move-gfw-system-config-to-top-level'
Make `git config --system` work like you think it should on Windows: it
should edit the file that is located in `<Git>\etc\gitconfig`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:06 +02:00
Johannes Schindelin
5068c8a13d Merge pull request #2351 from PhilipOakley/vcpkg-tip
Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs
2020-04-20 16:50:06 +02:00
Johannes Schindelin
7a6f818648 Merge pull request #2316 from carenas/win-pcre1-cleanup
config.mak.uname: PCRE1 cleanup
2020-04-20 16:50:05 +02:00
Johannes Schindelin
c83cc594de Merge branch 'work-around-isilon'
It would appear that least the Isilon network filesystem (and possibly
other network filesystems, too), report non-standard error values when
trying to access a non-existing directory.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:05 +02:00
Johannes Schindelin
6a2d7e98dc Merge branch 'dont-clean-junctions'
This topic branch teaches `git clean` to respect NTFS junctions and Unix
bind mounts: it will now stop at those boundaries.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:05 +02:00
Johannes Schindelin
06b2819225 Merge branch 'msys2-strace'
Debugging support on MSYS2.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:04 +02:00
Johannes Schindelin
03cca7178c Merge branch 'robustify-is-hidden-tests'
In Git for Windows, there is an option to mark the .git directory as
hidden. Our test cases verify this by using the system utility
`attrib.exe`.

This file name is unfortunately quite generic, and overlaps with a
Unix-y utility that might be hiding the system one in the `PATH`.

Let's specify explicitly which `attrib` to use.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:04 +02:00
Johannes Schindelin
f9bce79dba Merge branch 'fflush-in-git-clean'
After writing to `stdout` and before reading from `stdin`, it is a good
idea to flush the former.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:04 +02:00
Johannes Schindelin
1b62b4e2e2 Merge pull request #2170 from dscho/gitk-long-cmdline
Fix gitk (long cmdline)
2020-04-20 16:50:03 +02:00
Johannes Schindelin
5c3cc3fb4e Merge branch 'fsync-object-files-always'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:03 +02:00
Johannes Schindelin
29b2b357ec Merge remote-tracking branch 'dscho/add-p' into add-p-g4w
Let's test this for a while.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:03 +02:00
Johannes Schindelin
6c88cca771 Merge branch 'dont-spawn-gzip-in-archive'
This topic branch avoids spawning `gzip` when asking `git archive` to
create `.tar.gz` files.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:03 +02:00
Johannes Schindelin
448e8da3c4 Merge branch 'mingw-expand-absolute-user-path'
When compiling Git with a runtime prefix (so that it can be installed
into any location, finding its libexec/ directory relative to the
location of the `git` executable), it is convenient to provide
"absolute" Unix-y paths e.g. for http.sslCAInfo, and have those absolute
paths be resolved relative to the runtime prefix.

This patch makes it so for Windows. It is up for discussion whether we
want this for other platforms, too, as long as building with
RUNTIME_PREFIX.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:02 +02:00
Johannes Schindelin
c3338dbb04 Merge branch 'drive-prefix'
This topic branch allows us to specify absolute paths without the drive
prefix e.g. when cloning.

Example:

	C:\Users\me> git clone https://github.com/git/git \upstream-git

This will clone into a new directory C:\upstream-git, in line with how
Windows interprets absolute paths.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:02 +02:00
Johannes Schindelin
40d1826540 Merge pull request #996 from jeffhostetler/jeffhostetler/register_rename_src
diffcore-rename: speed up register_rename_src
2020-04-20 16:50:02 +02:00
Johannes Schindelin
2b767a1f1c Merge 'remote-hg-prerequisites' into HEAD
These fixes were necessary for Sverre Rabbelier's remote-hg to work,
but for some magic reason they are not necessary for the current
remote-hg. Makes you wonder how that one gets away with it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:50:01 +02:00
Jeff Hostetler
d3249db9a3 mingw: improve performance of mingw_unlink()
Update mingw_unlink() to first try to delete the file with existing
permissions before trying to force it.

Windows throws an error when trying to delete a read-only file.  The
mingw_unlink() compatibility wrapper always tries to _wchmod(666) the
file before calling _wunlink() to avoid that error.  However, since
most files in the worktree are already writable, this is usually
wasted effort.

Update mingw_unlink() to just call DeleteFileW() directly and if that
succeeds return.  If that fails, fall back into the existing code path
to update the permissions and use _wunlink() to get the existing
error code mapping.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:49:46 +02:00
Remy Bohmer
e64a88ac7b [fix] Gitk fails to open on a bare Git repository on Windows
Running 'git rev-parse --show-toplevel' fails on a bare git repo.
This causes gitk to fail to startup.

Signed-off-by: Remy Bohmer <github@bohmer.net>
2020-04-20 16:47:17 +02:00
Johannes Schindelin
d16b5bfe46 Merge 'sgn/github-action-latest'
This topic thicket defines a Continuous Integration/Pull Request build
using GitHub Actions, and retires our Azure Pipeline in return.

The secondary change in this topic thicket is to make sure that Git
works with musl's libc and with BusyBox (which simplifies/changes a
couple of Git for Windows' own BusyBox patches, too).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:47:17 +02:00
Johannes Schindelin
bc85f3e870 Merge branch 'sgn/github-action-v4-on-2.26.0'
This topic branch replaces the Azure Pipeline with a GitHub workflow.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:47:16 +02:00
Johannes Schindelin
bf304e61b8 Merge branch 'dd/test-with-busybox'
This topic branch is actually _required_ for `dd/ci-musl-libc` to work.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:47:16 +02:00
Johannes Schindelin
dceac0e761 Merge branch 'dd/ci-musl-libc'
A new CI job to build and run test suite on linux with musl libc has
been added.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2020-04-20 16:47:16 +02:00
Johannes Schindelin
7203c1b2a9 ci: let GitHub Actions upload failed tests' directories
Arguably, CI builds' most important task is to not only identify
regressions, but to make it as easy as possible to investigate what went
wrong.

In that light, we will want to provide users with a way to inspect the
tests' output as well as the corresponding directories.

This commit adds build steps that are only executed when tests failed,
uploading the relevant information as build artifacts. These artifacts
can then be downloaded by interested parties to diagnose the failures
more efficiently.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
2020-04-20 16:47:15 +02:00
Johannes Schindelin
dd48a9f53e ci: add a problem matcher for GitHub Actions
With this patch, test failures will be annotated with a helpful,
clickable message in GitHub Actions. For details, see
https://github.com/actions/toolkit/blob/master/docs/problem-matchers.md

Note: we need to set `TEST_SHELL_PATH` to Bash so that the problem
matcher is fed a file and line number for each test failure.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
2020-04-20 16:47:15 +02:00
Johannes Schindelin
618e014027 tests: when run in Bash, annotate test failures with file name/line number
When a test fails, it is nice to see where the corresponding code lives
in the worktree. Sadly, it seems that only Bash allows us to infer this
information. Let's do it when we detect that we're running in a Bash.

This will come in handy in the next commit, where we teach the GitHub
Actions workflow to annotate failed test runs with this information.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
2020-04-20 16:47:15 +02:00
Johannes Schindelin
37837c557b ci: retire the Azure Pipelines definition
We have GitHub Actions now. Running the same builds and tests in Azure
Pipelines would be redundant, and a waste of energy.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
2020-04-20 16:47:15 +02:00