Rebase to v2.36.0-rc2#3785

Merged

vdye merged 349 commits into

git-for-windows:mainfrom

vdye:rebase-to-v2.36.0-rc2

Apr 18, 2022

This pull request is big! We're only showing the most recent 250 commits

Commits on Apr 18, 2022

subtree: update `contrib/subtree` `test` target
vdye
committed
CMakeLists: add default "x64-windows" arch for Visual Studio

PhilipOakley
authored and
vdye
committed
fsmonitor--daemon: prepare for adding health thread

jeffhostetler
authored and
vdye
committed
ci(): add HOST_CPU to CMake command

dennisameling
authored and
vdye
committed
ci(vs-build): download the vcpkg artifacts using a dedicated Action

dscho
authored and
vdye
committed
mingw: allow for longer paths in `parse_interpreter()`

dscho
authored and
vdye
committed
compat/vcbuild: document preferred way to build in Visual Studio

dscho
authored and
vdye
committed
http: optionally send SSL client certificate

pascalmuller
authored and
vdye
committed
ci: run `contrib/subtree` tests in CI builds
vdye
committed
CMake: show Win32 and Generator_platform build-option values

PhilipOakley
authored and
vdye
committed
init: do parse _all_ core.* settings early

dscho
authored and
vdye
committed
fsmonitor--daemon: rename listener thread related variables

jeffhostetler
authored and
vdye
committed
fsmonitor--daemon: stub in health thread

jeffhostetler
authored and
vdye
committed
bulk-checkin: rename 'state' variable and separate 'plugged' boolean

neerajsi-msft
authored and
vdye
committed
fsm-health-win32: add polling framework to monitor daemon health

jeffhostetler
authored and
vdye
committed
bulk-checkin: rebrand plug/unplug APIs as 'odb transactions'

neerajsi-msft
authored and
vdye
committed
fsm-health-win32: force shutdown daemon if worktree root moves

jeffhostetler
authored and
vdye
committed
core.fsyncmethod: batched disk flushes for loose-objects

neerajsi-msft
authored and
vdye
committed
fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed

jeffhostetler
authored and
vdye
committed
cache-tree: use ODB transaction around writing a tree

neerajsi-msft
authored and
vdye
committed
fsmonitor: optimize processing of directory events

jeffhostetler
authored and
vdye
committed
builtin/add: add ODB transaction around add_files_to_cache

neerajsi-msft
authored and
vdye
committed
t7527: FSMonitor tests for directory moves

jeffhostetler
authored and
vdye
committed
hash-object: demonstrate a >4GB/LLP64 problem

PhilipOakley
authored and
vdye
committed
update-index: use the bulk-checkin infrastructure

neerajsi-msft
authored and
vdye
committed
t/perf/p7527: add perf test for builtin FSMonitor

jeffhostetler
authored and
vdye
committed
hash_object_file_literally(): use size_t

PhilipOakley
authored and
vdye
committed
unpack-objects: use the bulk-checkin infrastructure

neerajsi-msft
authored and
vdye
committed
fsmonitor: never set CE_FSMONITOR_VALID on submodules

jeffhostetler
authored and
vdye
committed
object-file.c: use size_t for header lengths

PhilipOakley
authored and
vdye
committed
core.fsync: use batch mode and sync loose objects by default on Windows

neerajsi-msft
authored and
vdye
committed
Merge 'remote-hg-prerequisites' into HEAD

dscho
authored and
vdye
committed
t7527: test FSMonitor on case insensitive+preserving file system

jeffhostetler
authored and
vdye
committed
hash algorithms: use size_t for section lengths

PhilipOakley
authored and
vdye
committed
test-lib-functions: add parsing helpers for ls-files and ls-tree

neerajsi-msft
authored and
vdye
committed
Merge branch 'drive-prefix'

dscho
authored and
vdye
committed
fsmonitor: on macOS also emit NFC spelling for NFD pathname

jeffhostetler
authored and
vdye
committed
hash-object --stdin: verify that it works with >4GB/LLP64

PhilipOakley
authored and
vdye
committed
core.fsyncmethod: tests for batch mode

neerajsi-msft
authored and
vdye
committed
Merge branch 'dont-spawn-gzip-in-archive'

dscho
authored and
vdye
committed
t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd

jeffhostetler
authored and
vdye
committed
fsmonitor: reintroduce core.useBuiltinFSMonitor
vdye
committed
hash-object: add another >4GB/LLP64 test case

PhilipOakley
authored and
vdye
committed
t/perf: add iteration setup mechanism to perf-lib

neerajsi-msft
authored and
vdye
committed
Merge branch 'fsync-object-files-always'

dscho
authored and
vdye
committed
t7527: test Unicode NFC/NFD handling on MacOS

jeffhostetler
authored and
vdye
committed
Enable the built-in FSMonitor as an experimental feature

dscho
authored and
vdye
committed
hash-object: add a >4GB/LLP64 test case using filtered input

PhilipOakley
authored and
vdye
committed
core.fsyncmethod: performance tests for batch mode

neerajsi-msft
authored and
vdye
committed
Merge pull request #2170 from dscho/gitk-long-cmdline

dscho
authored and
vdye
committed
Merge branch 'dont-clean-junctions'

dscho
authored and
vdye
committed
Merge branch 'msys2-python'

dscho
authored and
vdye
committed
Merge pull request #2375 from assarbad/reintroduce-sideband-config

dscho
authored and
vdye
committed
Merge pull request #2405 from dscho/mingw-setsockopt

dscho
authored and
vdye
committed
Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks

dscho
authored and
vdye
committed
Merge pull request #2488 from bmueller84/master

dscho
authored and
vdye
committed
Merge pull request #2501 from jeffhostetler/clink-debug-curl

dscho
authored and
vdye
committed
Merge pull request #2504 from dscho/access-repo-via-junction

dscho
authored and
vdye
committed
Merge pull request #2506 from dscho/issue-2283

dscho
authored and
vdye
committed
Merge pull request #2535 from dscho/schannel-revoke-best-effort

dscho
authored and
vdye
committed
Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master

dscho
authored and
vdye
committed
Merge 'add-p-many-files'

dscho
authored and
vdye
committed
Merge pull request #2730 from dscho/crlf-aware-git-add-i

dscho
authored and
vdye
committed
Merge pull request #2714 from lbonanomi/main

dscho
authored and
vdye
committed
Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info

dscho
authored and
vdye
committed
Merge 'git-gui/js/intent-to-add'

dscho
authored and
vdye
committed
Merge pull request #2974 from derrickstolee/maintenance-and-headless

dscho
authored and
vdye
committed
Merge pull request #2351 from PhilipOakley/vcpkg-tip

dscho
authored and
vdye
committed
Merge pull request #2915 from dennisameling/windows-arm64-support

dscho
authored and
vdye
committed
Merge pull request #3327 from dennisameling/fix-host-cpu

dscho
authored and
vdye
committed
Merge pull request #3150 from dscho/ci-cache-vcpkg-artifacts-g4w

dscho
authored and
vdye
committed
Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path

dscho
authored and
vdye
committed
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore

dscho
authored and
vdye
committed
Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate

dscho
authored and
vdye
committed
Merge pull request #3349 from vdye/feature/ci-subtree-tests

dscho
authored and
vdye
committed
Merge pull request #3306 from PhilipOakley/vs-sln

dscho
authored and
vdye
committed
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier

dscho
authored and
vdye
committed
Merge branch 'trial-fsmonitor-march-2022-part3' into trial-fsmonitor-march-2022

jeffhostetler
authored and
vdye
committed
Merge branch 'mark-v4-fsmonitor-experimental' into try-v4-fsmonitor

jeffhostetler
authored and
vdye
committed
Win32: make FILETIME conversion functions public

kblees
authored and
vdye
committed
Win32: dirent.c: Move opendir down

kblees
authored and
vdye
committed
mingw: make the dirent implementation pluggable

kblees
authored and
vdye
committed
Win32: make the lstat implementation pluggable

kblees
authored and
vdye
committed
add infrastructure for read-only file system level caches

kblees
authored and
vdye
committed
Merge pull request #3533 from PhilipOakley/hashliteral_t

dscho
authored and
vdye
committed
fscache: add key for GIT_TRACE_FSCACHE

jeffhostetler
authored and
vdye
committed
dir.c: make add_excludes aware of fscache during status

jeffhostetler
authored and
vdye
committed
mingw: add a cache below mingw's lstat and dirent implementations

kblees
authored and
vdye
committed
Merge branch 'ns-batch-fsync' into HEAD
vdye
committed
fscache: remember not-found directories

jeffhostetler
authored and
vdye
committed
fscache: make fscache_enabled() public

jeffhostetler
authored and
vdye
committed
fscache: load directories only once

kblees
authored and
vdye
committed
Merge branch 'ready-for-upstream'

dscho
authored and
vdye
committed
fscache: add a test for the dir-not-found optimization

dscho
authored and
vdye
committed
add: use preload-index and fscache for performance

jeffhostetler
authored and
vdye
committed
dir.c: regression fix for add_excludes with fscache

jeffhostetler
authored and
vdye
committed
fetch-pack.c: enable fscache for stats under .git/objects

Takuto Ikuta
authored and
vdye
committed
checkout.c: enable fscache for checkout again

Takuto Ikuta
authored and
vdye
committed
gitk: Unicode file name support

kblees
authored and
vdye
committed
mem_pool: add GIT_TRACE_MEMPOOL support

benpeart
authored and
vdye
committed
git-gui: provide question helper for retry fallback on Windows

hvoigt
authored and
vdye
committed
git-gui--askyesno: fix funny text wrapping

dscho
authored and
vdye
committed
gitk: Use an external icon file on Windows

sschuberth
authored and
vdye
committed
fscache: fscache takes an initial size

benpeart
authored and
vdye
committed
fscache: remember the reparse tag for each entry

dscho
authored and
vdye
committed
git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

dscho
authored and
vdye
committed
git-gui--askyesno: allow overriding the window title

dscho
authored and
vdye
committed
gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6

dscho
authored and
vdye
committed
fscache: update fscache to be thread specific instead of global

benpeart
authored and
vdye
committed
fscache: implement an FSCache-aware is_mount_point()

dscho
authored and
vdye
committed
Enable the filesystem cache (fscache) in refresh_index().

benpeart
authored and
vdye
committed
respect core.hooksPath, falling back to .git/hooks

dscho
authored and
vdye
committed
Merge 'git-gui' into HEAD

dscho
authored and
vdye
committed
fscache: use FindFirstFileExW to avoid retrieving the short name

benpeart
authored and
vdye
committed
git-gui--askyesno (mingw): use Git for Windows' icon, if available

dscho
authored and
vdye
committed
status: disable and free fscache at the end of the status command

benpeart
authored and
vdye
committed
gitk: make the "list references" default window width wider

sidecut
authored and
vdye
committed
fscache: add GIT_TEST_FSCACHE support

benpeart
authored and
vdye
committed
fscache: add fscache hit statistics

benpeart
authored and
vdye
committed
fscache: teach fscache to use mempool

benpeart
authored and
vdye
committed
fscache: make fscache_enable() thread safe

benpeart
authored and
vdye
committed
fscache: teach fscache to use NtQueryDirectoryFile

benpeart
authored and
vdye
committed
unpack-trees: enable fscache for sparse-checkout

derrickstolee
authored and
vdye
committed
clean: make use of FSCache

dscho
authored and
vdye
committed
Merge branch 'fscache'

dscho
authored and
vdye
committed
Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd

dscho
authored and
vdye
committed
Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_fscache

dscho
authored and
vdye
committed
Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fscache

dscho
authored and
vdye
committed
Merge pull request #1426 from atetubou/fetch_pack

dscho
authored and
vdye
committed
Merge pull request #1468 from atetubou/fscache_checkout_flush

dscho
authored and
vdye
committed
Merge pull request #1827 from benpeart/fscache_refresh_index

dscho
authored and
vdye
committed
Merge branch 'git-gui-hooks-path' of https://github.com/dscho/git-gui

dscho
authored and
vdye
committed
Merge pull request #1908 from benpeart/FindFirstFileEx-gfw

dscho
authored and
vdye
committed
Merge branch 'git-gui-askyesno'

dscho
authored and
vdye
committed
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw

dscho
authored and
vdye
committed
Merge 'gitk' into HEAD

dscho
authored and
vdye
committed
strbuf_readlink: don't call readlink twice if hint is the exact link size

kblees
authored and
vdye
committed
strbuf_readlink: support link targets that exceed PATH_MAX

kblees
authored and
vdye
committed
lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

kblees
authored and
vdye
committed
Win32: don't call GetFileAttributes twice in mingw_lstat()

kblees
authored and
vdye
committed
Win32: implement stat() with symlink support

kblees
authored and
vdye
committed
Win32: remove separate do_lstat() function

kblees
authored and
vdye
committed
Win32: let mingw_lstat() error early upon problems with reparse points

kblees
authored and
vdye
committed
mingw: teach fscache and dirent about symlinks

kblees
authored and
vdye
committed
Win32: lstat(): return adequate stat.st_size for symlinks

kblees
authored and
vdye
committed
Win32: factor out retry logic

kblees
authored and
vdye
committed
Win32: change default of 'core.symlinks' to false

kblees
authored and
vdye
committed
Win32: add symlink-specific error codes

kblees
authored and
vdye
committed
Merge pull request #1911 from benpeart/git_test_fscache-gfw

dscho
authored and
vdye
committed
Win32: mingw_unlink: support symlinks to directories

kblees
authored and
vdye
committed
Merge pull request #1910 from benpeart/fscache_statistics-gfw

dscho
authored and
vdye
committed
Win32: mingw_rename: support renaming symlinks

kblees
authored and
vdye
committed
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'

dscho
authored and
vdye
committed
Win32: mingw_chdir: change to symlink-resolved directory

kblees
authored and
vdye
committed
Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw

dscho
authored and
vdye
committed
pack-objects (mingw): demonstrate a segmentation fault with large deltas

vangdfang
authored and
vdye
committed
mingw: Support `git_terminal_prompt` with more terminals

kblees
authored and
vdye
committed
Win32: implement readlink()

kblees
authored and
vdye
committed
Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw

dscho
authored and
vdye
committed
mingw: support long paths

kblees
authored and
vdye
committed
compat/terminal.c: only use the Windows console if bash 'read -r' fails

kblees
authored and
vdye
committed
mingw: lstat: compute correct size for symlinks

billziss-gh
authored and
vdye
committed
Merge branch 'fscache-and-sparse-checkout'

derrickstolee
authored and
vdye
committed
Win32: fix 'lstat("dir/")' with long paths

kblees
authored and
vdye
committed
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

dscho
authored and
vdye
committed
Win32: implement basic symlink() functionality (file symlinks only)

kblees
authored and
vdye
committed
Merge branch 'dont-clean-junctions-fscache'

dscho
authored and
vdye
committed
mingw: ensure that core.longPaths is handled *always*

dscho
authored and
vdye
committed
compat/fsmonitor/fsm-*-win32: support long paths

jeffhostetler
authored and
vdye
committed
Unbreak interactive GPG prompt upon signing

dscho
authored and
vdye
committed
mingw: explicitly specify with which cmd to prefix the cmdline

dscho
authored and
vdye
committed
mingw: when path_lookup() failed, try BusyBox

dscho
authored and
vdye
committed
test-lib: avoid unnecessary Perl invocation

dscho
authored and
vdye
committed
tests: replace mingw_test_cmp with a helper in C

dscho
authored and
vdye
committed
test-tool: learn to act as a drop-in replacement for `iconv`

dscho
authored and
vdye
committed
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`

dscho
authored and
vdye
committed
gitattributes: mark .png files as binary

dscho
authored and
vdye
committed
tests: move test PNGs into t/lib-diff/

dscho
authored and
vdye
committed
tests: only override sort & find if there are usable ones in /usr/bin/

dscho
authored and
vdye
committed
tests: use the correct path separator with BusyBox

dscho
authored and
vdye
committed
mingw: only use Bash-ism `builtin pwd -W` when available

dscho
authored and
vdye
committed
tests (mingw): remove Bash-specific pwd option

dscho
authored and
vdye
committed
test-lib: add BUSYBOX prerequisite

dscho
authored and
vdye
committed
t0021: use Windows path when appropriate

dscho
authored and
vdye
committed
t5003: use binary file from t/lib-diff/

dscho
authored and
vdye
committed
t5532: workaround for BusyBox on Windows

dscho
authored and
vdye
committed
Win32: symlink: add support for symlinks to directories

kblees
authored and
vdye
committed
mingw: introduce code to detect whether we're inside a Windows container

zcube
authored and
vdye
committed
Win32: symlink: move phantom symlink creation to a separate function

piscisaureus
authored and
vdye
committed
t5605: special-case hardlink test for BusyBox-w32

dscho
authored and
vdye
committed
mingw: try to create symlinks without elevated permissions

dscho
authored and
vdye
committed
mingw: when running in a Windows container, try to rename() harder

zcube
authored and
vdye
committed
Introduce helper to create symlinks that knows about index_state

dscho
authored and
vdye
committed
t5813: allow for $PWD to be a Windows path

dscho
authored and
vdye
committed
mingw: emulate stat() a little more faithfully

dscho
authored and
vdye
committed
mingw: move the file_attr_to_st_mode() function definition

zcube
authored and
vdye
committed
mingw: allow to specify the symlink type in .gitattributes

piscisaureus
authored and
vdye
committed
t9200: skip tests when $PWD contains a colon

dscho
authored and
vdye
committed
mingw: kill child processes in a gentler way

dscho
authored and
vdye
committed
mingw: special-case index entries for symlinks with buggy size

dscho
authored and
vdye
committed
mingw: Windows Docker volumes are *not* symbolic links

dscho
authored and
vdye
committed
Win32: symlink: add test for `symlink` attribute

piscisaureus
authored and
vdye
committed
mingw: add a Makefile target to copy test artifacts

dscho
authored and
vdye
committed
mingw: really handle SIGINT

dscho
authored and
vdye
committed
mingw: do not call xutftowcs_path in mingw_mktemp

neerajsi-msft
authored and
vdye
committed
Partially un-revert "editor: save and reset terminal after calling EDITOR"

dscho
authored and
vdye
committed
status: carry the --no-lock-index option for backwards-compatibility

dscho
authored and
vdye
committed
Modify the Code of Conduct for Git for Windows

dscho
authored and
vdye
committed
Merge branch 'gitk-and-git-gui-patches'

dscho
authored and
vdye
committed
CONTRIBUTING.md: add guide for first-time contributors

derrickstolee
authored and
vdye
committed
Merge branch 'long-paths'

dscho
authored and
vdye
committed
README.md: Add a Windows-specific preamble

dscho
authored and
vdye
committed
Merge branch 'fix-v4-fsmonitor-long-paths' into try-v4-fsmonitor

jeffhostetler
authored and
vdye
committed
Add an issue template

shiftkey
authored and
vdye
committed
Merge branch 'msys2'

dscho
authored and
vdye
committed
Modify the GitHub Pull Request template (to reflect Git for Windows)

Philip Oakley
authored and
vdye
committed
Merge branch 'kblees/kb/symlinks'

dscho
authored and
vdye
committed
.github: Add configuration for the Sentiment Bot

dscho
authored and
vdye
committed
Merge 'docker-volumes-are-no-symlinks'

dscho
authored and
vdye
committed
Document how $HOME is set on Windows

alejandro5042
authored and
vdye
committed
Merge pull request #1897 from piscisaureus/symlink-attr

dscho
authored and
vdye
committed
status: reinstate --show-ignored-directory as a deprecated option

dscho
authored and
vdye
committed
reset: reinstate support for the deprecated --stdin option

dscho
authored and
vdye
committed
mingw: deprecate old-style runtime-prefix handling in interpolate_path()

dscho
authored and
vdye
committed
Add a GitHub workflow to monitor component updates

authored and
vdye
committed
SECURITY.md: document Git for Windows' policies

dscho
authored and
vdye
committed
Merge branch 'busybox-w32'

dscho
authored and
vdye
committed
Merge pull request #1170 from dscho/mingw-kill-process

dscho
authored and
vdye
committed
Merge pull request #3492 from dscho/ns/batched-fsync
vdye
committed
Merge branch 'un-revert-editor-save-and-reset'

dscho
authored and
vdye
committed
Merge branch 'status-no-lock-index'

dscho
authored and
vdye
committed
Merge pull request #1354 from dscho/phase-out-show-ignored-directory-gracefully

dscho
authored and
vdye
committed
Merge branch 'phase-out-reset-stdin'

dscho
authored and
vdye
committed
Merge branch 'deprecate-old-runtime-prefix-path-interpolation'

dscho
authored and
vdye
committed
rebase: help user when dying with preserve-merges`

PhilipOakley
authored and
vdye
committed
Merge pull request #2837 from dscho/monitor-component-updates

dscho
authored and
vdye
committed
Allow debugging unsafe directories' ownership

dscho
authored and
vdye
committed
rebase: `preserve` is also a pull option, tell dying users

PhilipOakley
authored and
vdye
committed
Merge 'readme' into HEAD

dscho
authored and
vdye
committed
mingw: handle a file owned by the Administrators group correctly

dscho
authored and
vdye
committed
Merge pull request #3708 from PhilipOakley/die_preserve

dscho
authored and
vdye
committed
t0033: add tests for safe.directory

derrickstolee
authored and
vdye
committed
setup: fix safe.directory key not being checked

Matheus28
authored and
vdye
committed
setup: opt-out of check with safe.directory=*

derrickstolee
authored and
vdye
committed
setup: properly use "%(prefix)/" when in WSL

derrickstolee
authored and
vdye
committed
Include trailing slash in prefix instructions

michaelosthege
authored and
vdye
committed
Merge tag 'v2.35.2.windows.1'
vdye
committed
compat/mingw.c: do not warn when failing to get owner

derrickstolee
authored and
vdye
committed
Merge pull request #3790: Include trailing slash in prefix migration instructions

derrickstolee
authored and
vdye
committed
Merge pull request #3791: Various fixes around `safe.directory`

derrickstolee
authored and
vdye
committed