Commit Graph

129042 Commits

Author SHA1 Message Date
Karsten Blees
483feb9be4 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>
2022-01-24 11:15:10 -08:00
Johannes Schindelin
d5e05c0fa8 Merge branch 'ready-for-upstream'
This is the branch thicket of patches in Git for Windows that are
considered ready for upstream. To keep them in a ready-to-submit shape,
they are kept as close to the beginning of the branch thicket as
possible.
2022-01-24 11:15:10 -08:00
Johannes Schindelin
a09b0234ef Merge pull request #3533 from PhilipOakley/hashliteral_t
Begin `unsigned long`->`size_t` conversion to support large files on Windows
2022-01-24 11:15:09 -08:00
Jeff Hostetler
edcfca8e71 Merge branch 'mark-v4-fsmonitor-experimental' into try-v4-fsmonitor 2022-01-24 11:15:09 -08:00
Johannes Schindelin
707c4f67c4 Merge pull request #3456 from jeffhostetler/try-v4-fsmonitor-part5
FSMonitor: deepening a directory causes confusing events
2022-01-24 11:15:09 -08:00
Jeff Hostetler
aafbef8aad Merge branch 'try-v4-fsmonitor-part4' into try-v4-fsmonitor 2022-01-24 11:15:09 -08:00
Jeff Hostetler
f7d78d89e9 Merge branch 'try-v4-fsmonitor-part3' into try-v4-fsmonitor 2022-01-24 11:15:09 -08:00
Jeff Hostetler
3d215333f7 Merge branch 'try-v4-fsmonitor-part2' into try-v4-fsmonitor 2022-01-24 11:15:09 -08:00
Johannes Schindelin
90d1b017a5 Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
init: respect core.symlinks before copying the templates
2022-01-24 11:15:09 -08:00
Johannes Schindelin
42edd55c30 Merge pull request #3306 from PhilipOakley/vs-sln
Make Git for Windows start builds in modern Visual Studio
2022-01-24 11:15:09 -08:00
Johannes Schindelin
942f1abbae Merge pull request #3349 from vdye/feature/ci-subtree-tests
Add `contrib/subtree` test execution to CI builds
2022-01-24 11:15:09 -08:00
Johannes Schindelin
0a0b767ded Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate
http: Add support for enabling automatic sending of SSL client certificate
2022-01-24 11:15:09 -08:00
Johannes Schindelin
98ab39de02 Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
Let the documentation reflect that there is no vs/master anymore
2022-01-24 11:15:09 -08:00
Johannes Schindelin
635b1ea8fc Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path
mingw: allow for longer paths in `parse_interpreter()`
2022-01-24 11:15:08 -08:00
Johannes Schindelin
8956d4b744 Merge pull request #3150 from dscho/ci-cache-vcpkg-artifacts-g4w
ci: cache vcpkg artifacts
2022-01-24 11:15:08 -08:00
Johannes Schindelin
6a793da526 Merge pull request #3327 from dennisameling/fix-host-cpu
cmake(): allow setting HOST_CPU for cross-compilation
2022-01-24 11:15:08 -08:00
Johannes Schindelin
6dd6d14679 Merge pull request #2915 from dennisameling/windows-arm64-support
Windows arm64 support
2022-01-24 11:15:08 -08:00
Johannes Schindelin
73473aebb0 Merge pull request #2351 from PhilipOakley/vcpkg-tip
Vcpkg Install: detect lack of working Git, and note possible vcpkg time outs
2022-01-24 11:15:08 -08:00
Johannes Schindelin
dce78caab0 Merge pull request #2974 from derrickstolee/maintenance-and-headless
Include Windows-specific maintenance and headless-git
2022-01-24 11:15:08 -08:00
Johannes Schindelin
00bef7af2c Merge 'git-gui/js/intent-to-add'
This merges the current version of the patch that tries to address Git
GUI's problems with intent-to-add files.

This patch will likely be improved substantially before it is merged
into Git GUI's main branch, but we want to have _something_ resembling a
fix already in Git for Windows v2.29.0.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-24 11:15:08 -08:00
Johannes Schindelin
cfcf4bd2db Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
t/t0014: fix: eliminate additional lines from trace
2022-01-24 11:15:08 -08:00
Johannes Schindelin
9c65f58a93 Merge pull request #2714 from lbonanomi/main
Rationalize line endings for scissors-cleanup
2022-01-24 11:15:08 -08:00
Johannes Schindelin
991310793e Merge pull request #2730 from dscho/crlf-aware-git-add-i
git add -i: handle CR/LF line endings in the interactive input
2022-01-24 11:15:08 -08:00
Johannes Schindelin
66ba31341a Merge 'add-p-many-files'
This topic branch allows `add -p` and `add -i` with a large number of
files. It is kind of a hack that was never really meant to be
upstreamed. Let's see if we can do better in the built-in `add -p`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-24 11:15:08 -08:00
Johannes Schindelin
6d444802a2 Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
ci: avoid d/f conflict in vs/master
2022-01-24 11:15:07 -08:00
Johannes Schindelin
182e3e5c09 Merge pull request #2535 from dscho/schannel-revoke-best-effort
Introduce and use the new "best effort" strategy for Secure Channel revoke checking
2022-01-24 11:15:07 -08:00
Johannes Schindelin
af797f7a93 Merge pull request #2506 from dscho/issue-2283
Allow running Git directly from `C:\Program Files\Git\mingw64\bin\git.exe`
2022-01-24 11:15:07 -08:00
Johannes Schindelin
ce3aa78f01 Merge pull request #2504 from dscho/access-repo-via-junction
Handle `git add <file>` where <file> traverses an NTFS junction
2022-01-24 11:15:07 -08:00
Johannes Schindelin
fe5ceef02d Merge pull request #2501 from jeffhostetler/clink-debug-curl
clink.pl: fix MSVC compile script to handle libcurl-d.lib
2022-01-24 11:15:07 -08:00
Johannes Schindelin
bbb2acfe0c Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2022-01-24 11:15:07 -08:00
Johannes Schindelin
df3fa239a0 Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks
Do resolve symlinks in `getcwd()`
2022-01-24 11:15:07 -08:00
Johannes Schindelin
af0827ecc3 Merge pull request #2405 from dscho/mingw-setsockopt
Make sure `errno` is set when socket operations fail
2022-01-24 11:15:07 -08:00
Johannes Schindelin
3edc5dfdd5 Merge pull request #2375 from assarbad/reintroduce-sideband-config
Config option to disable side-band-64k for transport
2022-01-24 11:15:07 -08:00
Johannes Schindelin
e8b9313da0 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>
2022-01-24 11:15:07 -08:00
Johannes Schindelin
eece4f9e64 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>
2022-01-24 11:15:07 -08:00
Johannes Schindelin
02823d689e Merge pull request #2170 from dscho/gitk-long-cmdline
Fix gitk (long cmdline)
2022-01-24 11:15:07 -08:00
Philip Oakley
3c7f559112 hash-object: add a >4GB/LLP64 test case using filtered input
To verify that the `clean` side of the `clean`/`smudge` filter code is
correct with regards to LLP64 (read: to ensure that `size_t` is used
instead of `unsigned long`), here is a test case using a trivial filter,
specifically _not_ writing anything to the object store to limit the
scope of the test case.

As in previous commits, the `big` file from previous test cases is
reused if available, to save setup time, otherwise re-generated.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-24 11:15:06 -08:00
Johannes Schindelin
728d730e9e Enable the built-in FSMonitor as an experimental feature
If `feature.experimental` and `feature.manyFiles` are set and the user
has not explicitly turned off the builtin FSMonitor, we now start
the built-in FSMonitor by default.

Only forcing it when UNSET matches the behavior of UPDATE_DEFAULT_BOOL()
used for other repo settings.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2022-01-24 11:15:06 -08:00
Jeff Hostetler
10f63bbc8c t7527: FSMonitor tests for directory moves
Create unit tests to move a directory.  Verify that `git status`
gives the same result with and without FSMonitor enabled.

NEEDSWORK: This test exposes a bug in the untracked-cache on
Windows when FSMonitor is disabled.  These are commented out
for the moment.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2022-01-24 11:15:06 -08:00
Jeff Hostetler
8d4e3b0b3f fsmonitor: optimize processing of directory events
Teach Git to perform binary search over the cache-entries for a directory
notification and then linearly scan forward to find the immediate children.

Previously, when the FSMonitor reported a modified directory Git would
perform a linear search on the entire cache-entry array for all
entries matching that directory prefix and invalidate them.  Since the
cache-entry array is already sorted, we can use a binary search to
find the first matching entry and then only linearly walk forward and
invalidate entries until the prefix changes.

Also, the original code would invalidate anything having the same
directory prefix.  Since a directory event should only be received for
items that are immediately within the directory (and not within
sub-directories of it), only invalidate those entries and not the
whole subtree.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2022-01-24 11:15:06 -08:00
Johannes Schindelin
9b3a194a72 Merge branch 'fsync-object-files-always'
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-24 11:15:06 -08:00
Philip Oakley
9f6c0b117d hash-object: add another >4GB/LLP64 test case
To complement the `--stdin` and `--literally` test cases that verify
that we can hash files larger than 4GB on 64-bit platforms using the
LLP64 data model, here is a test case that exercises `hash-object`
_without_ any options.

Just as before, we use the `big` file from the previous test case if it
exists to save on setup time, otherwise generate it.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-24 11:15:06 -08:00
Johannes Schindelin
2d2a527435 fsmonitor: mark the built-in FSMonitor as experimental
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2022-01-24 11:15:06 -08:00
Jeff Hostetler
b2ff7beef9 fsmonitor: measure time taken to apply fsmonitor query result
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2022-01-24 11:15:06 -08:00
Johannes Schindelin
981ee4a01b 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>
2022-01-24 11:15:06 -08:00
Philip Oakley
78dada47de hash-object --stdin: verify that it works with >4GB/LLP64
Just like the `hash-object --literally` code path, the `--stdin` code
path also needs to use `size_t` instead of `unsigned long` to represent
memory sizes, otherwise it would cause problems on platforms using the
LLP64 data model (such as Windows).

To limit the scope of the test case, the object is explicitly not
written to the object store, nor are any filters applied.

The `big` file from the previous test case is reused to save setup time;
To avoid relying on that side effect, it is generated if it does not
exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`).

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-24 11:15:06 -08:00
Jeff Hostetler
89986edf52 compat/fsmonitor/fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
Teach the listener thread to shutdown the daemon if the spelling of the
worktree root directory changes.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2022-01-24 11:15:06 -08:00
Johannes Schindelin
c182139ed7 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>
2022-01-24 11:15:06 -08:00
Philip Oakley
436b9c488f hash algorithms: use size_t for section lengths
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.

This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).

The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:

This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:

    static void git_hash_sha1_update(git_hash_ctx *ctx,
                                     const void *data, size_t len)
    {
        git_SHA1_Update(&ctx->sha1, data, len);
    }

i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.

With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2022-01-24 11:15:06 -08:00
Jeff Hostetler
af4ff8b62f compat/fsmonitor/fsm-health-win32: force shutdown daemon if worktree root moves
Force shutdown fsmonitor daemon if the worktree root directory
is moved, renamed, or deleted.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
2022-01-24 11:15:06 -08:00