Rebase to v2.40.0-rc0 - #4316

Merged

dscho merged 1231 commits into

git-for-windows:mainfrom

dscho:rebase-to-v2.40.0-rc0

Feb 27, 2023

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

Commits on Feb 27, 2023

vcbuild: add an option to install individual 'features'

manbearian
authored and
dscho
committed
d3d1372
cmake: allow building for Windows/ARM64

dennisameling
authored and
dscho
committed
d9ac4a4
ci(vs-build) also build Windows/ARM64 artifacts

dennisameling
authored and
dscho
committed
d03b65e
vcpkg_install: add comment regarding slow network connections

PhilipOakley
authored and
dscho
committed
98c20fd
Add schannel to curl installation

dennisameling
authored and
dscho
committed
9415872
cmake(): allow setting HOST_CPU for cross-compilation

dennisameling
authored and
dscho
committed
7cf96a2
ci(vs-build): download the vcpkg artifacts using a dedicated Action
dscho
committed
cbb43ed
mingw: allow for longer paths in `parse_interpreter()`
dscho
committed
58a0bfb
CMake: default Visual Studio generator has changed

PhilipOakley
authored and
dscho
committed
a06ca96
.gitignore: add Visual Studio CMakeSetting.json file

PhilipOakley
authored and
dscho
committed
737c9fe
subtree: update `contrib/subtree` `test` target

vdye
authored and
dscho
committed
e255cd7
CMakeLists: add default "x64-windows" arch for Visual Studio

PhilipOakley
authored and
dscho
committed
ebc3e45
compat/vcbuild: document preferred way to build in Visual Studio
dscho
committed
6ce48e1
http: optionally send SSL client certificate

pascalmuller
authored and
dscho
committed
a2aab50
ci: run `contrib/subtree` tests in CI builds

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

PhilipOakley
authored and
dscho
committed
4919442
hash_object_file_literally(): use size_t

PhilipOakley
authored and
dscho
committed
ac14ccc
object-file.c: use size_t for header lengths

PhilipOakley
authored and
dscho
committed
63268cf
hash algorithms: use size_t for section lengths

PhilipOakley
authored and
dscho
committed
c150492
hash-object --stdin: verify that it works with >4GB/LLP64

PhilipOakley
authored and
dscho
committed
68413bf
hash-object: add another >4GB/LLP64 test case

PhilipOakley
authored and
dscho
committed
69c4a51
CMake: show Win32 and Generator_platform build-option values

PhilipOakley
authored and
dscho
committed
5ac7009
init: do parse _all_ core.* settings early
dscho
committed
dce8708
Enable the built-in FSMonitor as an experimental feature
dscho
committed
0ae62eb
vcxproj: allow building with `NO_PERL` again
dscho
committed
dda08aa
setup: properly use "%(prefix)/" when in WSL

derrickstolee
authored and
dscho
committed
1611c7c
vcxproj: require C11
dscho
committed
9e9e178
hash-object: add a >4GB/LLP64 test case using filtered input

PhilipOakley
authored and
dscho
committed
748e144
compat/mingw.c: do not warn when failing to get owner

derrickstolee
authored and
dscho
committed
ff8bbbf
mingw: $env:TERM="xterm-256color" for newer OSes

rkitover
authored and
dscho
committed
e3bf65b
winansi: check result and Buffer before using Name

1480c1
authored and
dscho
committed
f8a231f
Add config option `windows.appendAtomically`

sunzhuoshi
and
dscho
committed
305ccd2
vcxproj: ignore the `-pedantic` option
dscho
committed
29cb0ce
vcxproj: include reftable when committing `.vcxproj` files
dscho
committed
876176a
vcxproj: handle libreftable_test, too
dscho
committed
2122c03
vcxproj: avoid escaping double quotes in the defines
dscho
committed
c451257
ci: adjust Azure Pipeline for `runs_on_pool`
dscho
committed
fb4eda6
ci: stop linking the `prove` cache
dscho
committed
3d5698a
ci: reinstate Azure Pipelines support
dscho
committed
b536afb
azure-pipeline: drop the `GETTEXT_POISON` job
dscho
committed
3c2b586
azure-pipeline: stop hard-coding `apt-get` calls
dscho
committed
7e36c78
azure-pipeline: drop the code to write to/read from a file share
dscho
committed
26b80e8
azure-pipeline: use partial clone/parallel checkout to initialize minimal-sdk
dscho
committed
2e28b77
azure-pipeline: downcase the job name of the `Linux32` job
dscho
committed
5ce79a5
azure-pipeline: run static-analysis on jammy

ttaylorr
authored and
dscho
committed
9cb34f4
config.mak.uname: add support for clangarm64

dennisameling
authored and
dscho
committed
c6562b1
MinGW: link as terminal server aware

rimrul
authored and
dscho
committed
36a96ee
Fix Windows version resources

Mortein
authored and
dscho
committed
52ebea4
bswap.h: add support for built-in bswap functions

dennisameling
authored and
dscho
committed
3fa9bf3
ci: create clangarm64-build.yml

dennisameling
authored and
dscho
committed
8aeff6b
status: fix for old-style submodules with commondir

sceptical-coder
authored and
dscho
committed
a7a0d5f
Merge 'remote-hg-prerequisites' into HEAD
dscho
committed
c7f648a
Merge branch 'drive-prefix'
dscho
committed
c25f943
Merge branch 'fsync-object-files-always'
dscho
committed
79a739b
windows: skip linking `git-<command>` for built-ins
dscho
committed
ec040eb
Merge pull request #2170 from dscho/gitk-long-cmdline
dscho
committed
4a275d6
Merge branch 'dont-clean-junctions'
dscho
committed
7841fc7
Merge branch 'msys2-python'
dscho
committed
f908255
Merge branch 'mimalloc-v2.0.9'
dscho
committed
dc01795
Merge pull request #2375 from assarbad/reintroduce-sideband-config
dscho
committed
8b84328
Merge pull request #2405 from dscho/mingw-setsockopt
dscho
committed
3204754
Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks
dscho
committed
09c1301
Merge pull request #2488 from bmueller84/master
dscho
committed
047a248
Merge pull request #2501 from jeffhostetler/clink-debug-curl
dscho
committed
032ecf4
Merge pull request #2504 from dscho/access-repo-via-junction
dscho
committed
5615b35
Merge pull request #2506 from dscho/issue-2283
dscho
committed
87c327e
Merge pull request #2535 from dscho/schannel-revoke-best-effort
dscho
committed
b663d55
Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
dscho
committed
8446801
Merge 'add-p-many-files'
dscho
committed
14c9f71
Merge pull request #2730 from dscho/crlf-aware-git-add-i
dscho
committed
1aa324c
Merge pull request #2714 from lbonanomi/crlf-scissors
dscho
committed
5eb94b9
Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
dscho
committed
3a23612
Merge 'git-gui/js/intent-to-add'
dscho
committed
fb22542
Merge pull request #2974 from derrickstolee/maintenance-and-headless
dscho
committed
afa0991
Merge pull request #2351 from PhilipOakley/vcpkg-tip
dscho
committed
47a0b4d
Merge pull request #2915 from dennisameling/windows-arm64-support
dscho
committed
981ec65
Merge pull request #3327 from dennisameling/fix-host-cpu
dscho
committed
5a074ce
Merge pull request #3150 from dscho/ci-cache-vcpkg-artifacts-g4w
dscho
committed
adea145
Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path
dscho
committed
515c241
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
dscho
committed
b8a77d0
Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate
dscho
committed
8a000e8
Merge pull request #3349 from vdye/feature/ci-subtree-tests
dscho
committed
a45471e
Merge pull request #3306 from PhilipOakley/vs-sln
dscho
committed
d9ac4b7
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
dscho
committed
99ce6da
Merge branch 'mark-v4-fsmonitor-experimental' into try-v4-fsmonitor

jeffhostetler
authored and
dscho
committed
6d56526
Merge pull request #3533 from PhilipOakley/hashliteral_t
dscho
committed
be9c8ae
Merge pull request #3791: Various fixes around `safe.directory`

derrickstolee
authored and
dscho
committed
5c8966a
Merge pull request #3751 from rkitover/native-term
dscho
committed
d6fcd61
Merge pull request #3875 from 1480c1/wine/detect_msys_tty
dscho
committed
1e84026
Merge branch 'optionally-dont-append-atomically-on-windows'
dscho
committed
1dab181
Merge branch 'ci-fixes'
dscho
committed
de1d96d
Merge pull request #3942 from rimrul/mingw-tsaware
dscho
committed
e45b0dc
Fix Windows version resources (#4092)
dscho
committed
97f7470
Merge branch 'builtin-swap-functions'
dscho
committed
b438351
Add support for CLANGARM64 target (#3916)
dscho
committed
abab2e4
Fix global repository field not being cleared (#4083)
dscho
committed
72a33b1
Skip linking the "dashed" `git-<command>`s for built-ins (#4252)
dscho
committed
3a1ad56
Win32: make FILETIME conversion functions public

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

kblees
authored and
dscho
committed
cdc91b1
mingw: make the dirent implementation pluggable

kblees
authored and
dscho
committed
b9f1687
Win32: make the lstat implementation pluggable

kblees
authored and
dscho
committed
10ef2f1
add infrastructure for read-only file system level caches

kblees
authored and
dscho
committed
a6d68c8
mingw: add a cache below mingw's lstat and dirent implementations

kblees
authored and
dscho
committed
590c415
fscache: add key for GIT_TRACE_FSCACHE

jeffhostetler
authored and
dscho
committed
838fac9
fscache: load directories only once

kblees
authored and
dscho
committed
dd6dd95
Merge branch 'ready-for-upstream'
dscho
committed
7521915
dir.c: make add_excludes aware of fscache during status

jeffhostetler
authored and
dscho
committed
177e510
fscache: remember not-found directories

jeffhostetler
authored and
dscho
committed
06da444
fscache: make fscache_enabled() public

jeffhostetler
authored and
dscho
committed
76c7ca7
fscache: add a test for the dir-not-found optimization
dscho
committed
832f2c4
add: use preload-index and fscache for performance

jeffhostetler
authored and
dscho
committed
2590ea3
dir.c: regression fix for add_excludes with fscache

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

Takuto Ikuta
authored and
dscho
committed
1411cd7
checkout.c: enable fscache for checkout again

Takuto Ikuta
authored and
dscho
committed
d8ebf7c
mem_pool: add GIT_TRACE_MEMPOOL support

benpeart
authored and
dscho
committed
cb93e53
fscache: fscache takes an initial size

benpeart
authored and
dscho
committed
194ce5a
fscache: update fscache to be thread specific instead of global

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

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

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

benpeart
authored and
dscho
committed
a1f202f
fscache: add GIT_TEST_FSCACHE support

benpeart
authored and
dscho
committed
3d72754
fscache: add fscache hit statistics

benpeart
authored and
dscho
committed
f585ae3
fscache: teach fscache to use mempool

benpeart
authored and
dscho
committed
870a731
fscache: remember the reparse tag for each entry
dscho
committed
2a83e87
fscache: implement an FSCache-aware is_mount_point()
dscho
committed
030b620
git-gui: provide question helper for retry fallback on Windows

hvoigt
authored and
dscho
committed
6e76118
fscache: make fscache_enable() thread safe

benpeart
authored and
dscho
committed
29589f9
fscache: teach fscache to use NtQueryDirectoryFile

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

derrickstolee
authored and
dscho
committed
110b1db
clean: make use of FSCache
dscho
committed
5e51490
gitk: Unicode file name support

kblees
authored and
dscho
committed
e5c5ac7
git-gui--askyesno: fix funny text wrapping
dscho
committed
b95f801
gitk: Use an external icon file on Windows

sschuberth
authored and
dscho
committed
c0c6c2a
git-gui--askyesno: allow overriding the window title
dscho
committed
8d5cc8e
gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6
dscho
committed
5808618
git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
dscho
committed
89d111c
respect core.hooksPath, falling back to .git/hooks
dscho
committed
06b42d8
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho
committed
8d906a4
gitk: make the "list references" default window width wider

sidecut
authored and
dscho
committed
5241c7e
Merge 'git-gui' into HEAD
dscho
committed
7145855
Merge branch 'git-gui-hooks-path' of https://github.com/dscho/git-gui
dscho
committed
3e05428
Merge branch 'git-gui-askyesno'
dscho
committed
bbb3ab6
Merge branch 'fscache'
dscho
committed
13186d6
Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd
dscho
committed
5260c11
Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_fscache
dscho
committed
683c775
Merge 'gitk' into HEAD
dscho
committed
69367fb
Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fscache
dscho
committed
c202c77
Merge pull request #1426 from atetubou/fetch_pack
dscho
committed
2d76313
Merge pull request #1468 from atetubou/fscache_checkout_flush
dscho
committed
831fa38
Merge pull request #1827 from benpeart/fscache_refresh_index
dscho
committed
695f99e
Merge pull request #1908 from benpeart/FindFirstFileEx-gfw
dscho
committed
21e9153
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho
committed
a4e5f82
Merge pull request #1911 from benpeart/git_test_fscache-gfw
dscho
committed
da3930a
Merge pull request #1910 from benpeart/fscache_statistics-gfw
dscho
committed
3721a52
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho
committed
622c0c6
Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw
dscho
committed
0e0d33a
Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw
dscho
committed
c6cedc8
Merge branch 'fscache-and-sparse-checkout'

derrickstolee
authored and
dscho
committed
73626ae
Merge branch 'dont-clean-junctions-fscache'
dscho
committed
5e622c7
mingw: Support `git_terminal_prompt` with more terminals

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

vangdfang
authored and
dscho
committed
7b6c5d9
compat/terminal.c: only use the Windows console if bash 'read -r' fails

kblees
authored and
dscho
committed
72effe8
mingw: support long paths

kblees
authored and
dscho
committed
0f25ae5
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho
committed
67c8d85
Win32: fix 'lstat("dir/")' with long paths

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

jeffhostetler
authored and
dscho
committed
cd1ebc6
clean: suggest using `core.longPaths` if paths are too long to remove

mathstuf
authored and
dscho
committed
84676a0
Unbreak interactive GPG prompt upon signing
dscho
committed
614440c
strbuf_readlink: don't call readlink twice if hint is the exact link size

kblees
authored and
dscho
committed
97e1a08
strbuf_readlink: support link targets that exceed PATH_MAX

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

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

kblees
authored and
dscho
committed
729f0f5
Win32: implement stat() with symlink support

kblees
authored and
dscho
committed
5948c42
Win32: remove separate do_lstat() function

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

kblees
authored and
dscho
committed
4542a6d
mingw: teach fscache and dirent about symlinks

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

kblees
authored and
dscho
committed
3d6455d
Win32: factor out retry logic

kblees
authored and
dscho
committed
8e068d6
Win32: change default of 'core.symlinks' to false

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

kblees
authored and
dscho
committed
7d73cae
Win32: mingw_unlink: support symlinks to directories

kblees
authored and
dscho
committed
72cf36c
Win32: mingw_rename: support renaming symlinks

kblees
authored and
dscho
committed
4b357ff
Win32: mingw_chdir: change to symlink-resolved directory

kblees
authored and
dscho
committed
73ae84f
Win32: implement readlink()

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

billziss-gh
authored and
dscho
committed
83af0b6
Win32: implement basic symlink() functionality (file symlinks only)

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

kblees
authored and
dscho
committed
0d2ea31
mingw: try to create symlinks without elevated permissions
dscho
committed
5ec3d20
mingw: emulate stat() a little more faithfully
dscho
committed
baf2818
mingw: introduce code to detect whether we're inside a Windows container

zcube
authored and
dscho
committed
0ee652b
mingw: special-case index entries for symlinks with buggy size
dscho
committed
d639aa8
mingw: when running in a Windows container, try to rename() harder

zcube
authored and
dscho
committed
42ab733
mingw: move the file_attr_to_st_mode() function definition

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

piscisaureus
authored and
dscho
committed
e623bdc
mingw: Windows Docker volumes are *not* symbolic links
dscho
committed
62ae7a2
Introduce helper to create symlinks that knows about index_state
dscho
committed
d67da81
mingw: kill child processes in a gentler way
dscho
committed
e59bd08
mingw: really handle SIGINT
dscho
committed
11819ad
mingw: do not call xutftowcs_path in mingw_mktemp

neerajsi-msft
authored and
dscho
committed
b14858c
Partially un-revert "editor: save and reset terminal after calling EDITOR"
dscho
committed
bca7a33
reset: reinstate support for the deprecated --stdin option
dscho
committed
893bb04
mingw: deprecate old-style runtime-prefix handling in interpolate_path()
dscho
committed
707c60a
fsmonitor: reintroduce core.useBuiltinFSMonitor

vdye
authored and
dscho
committed
4735523
Describe Git for Windows' architecture [no ci]
dscho
committed
35c8dc6
Modify the Code of Conduct for Git for Windows
dscho
committed
8d15bd6
CONTRIBUTING.md: add guide for first-time contributors

derrickstolee
authored and
dscho
committed
2abe5b2
README.md: Add a Windows-specific preamble
dscho
committed
29cf512
Add an issue template

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

Philip Oakley
authored and
dscho
committed
2096e07
.github: Add configuration for the Sentiment Bot
dscho
committed
bc82078
Document how $HOME is set on Windows

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

dscho
and
rimrul
committed
9d3ca5b
SECURITY.md: document Git for Windows' policies
dscho
committed
4e7f5f2
Merge branch 'gitk-and-git-gui-patches'
dscho
committed
ca55d03
Merge branch 'long-paths'
dscho
committed
1b32e09
Merge branch 'fix-v4-fsmonitor-long-paths' into try-v4-fsmonitor

jeffhostetler
authored and
dscho
committed
ceb0c81
Merge pull request #3817 from mathstuf/name-too-long-advice
dscho
committed
9d5385c
Merge branch 'msys2'
dscho
committed
29e7139
Merge branch 'kblees/kb/symlinks'
dscho
committed
30d99e0
Merge 'docker-volumes-are-no-symlinks'
dscho
committed
668d353
mingw: allow to specify the symlink type in .gitattributes

piscisaureus
authored and
dscho
committed
0fc73a0
mingw: explicitly specify with which cmd to prefix the cmdline
dscho
committed
9dd0601
mingw: when path_lookup() failed, try BusyBox
dscho
committed
68a14c2
test-lib: avoid unnecessary Perl invocation
dscho
committed
c79f9e6
test-tool: learn to act as a drop-in replacement for `iconv`
dscho
committed
9b1ec0d
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho
committed
c7a9d71
gitattributes: mark .png files as binary
dscho
committed
ad9eb8a
tests: move test PNGs into t/lib-diff/
dscho
committed
4498773
tests: only override sort & find if there are usable ones in /usr/bin/
dscho
committed
f8707a4
tests: use the correct path separator with BusyBox
dscho
committed
abf8f1c
Win32: symlink: add test for `symlink` attribute

piscisaureus
authored and
dscho
committed
6e2155a
mingw: only use Bash-ism `builtin pwd -W` when available
dscho
committed
a847885
tests (mingw): remove Bash-specific pwd option
dscho
committed
26b04f6
test-lib: add BUSYBOX prerequisite
dscho
committed
4841293
t5003: use binary file from t/lib-diff/
dscho
committed
a897ddf
t5532: workaround for BusyBox on Windows
dscho
committed
42cb115
t5605: special-case hardlink test for BusyBox-w32
dscho
committed
b04c40f
t5813: allow for $PWD to be a Windows path
dscho
committed
71587f9
t9200: skip tests when $PWD contains a colon
dscho
committed
39c301c
mingw: add a Makefile target to copy test artifacts
dscho
committed
3bfb04c
Merge pull request #1897 from piscisaureus/symlink-attr
dscho
committed
a14de43
Merge branch 'busybox-w32'
dscho
committed
370571f
Merge pull request #1170 from dscho/mingw-kill-process
dscho
committed
b70e7d6
Merge pull request #3492 from dscho/ns/batched-fsync

vdye
authored and
dscho
committed
4487427
Merge branch 'un-revert-editor-save-and-reset'
dscho
committed
aa6b2fa
Merge branch 'phase-out-reset-stdin'
dscho
committed
32cd181
Merge branch 'deprecate-old-runtime-prefix-path-interpolation'
dscho
committed
cafea19
Merge branch 'deprecate-core.useBuiltinFSMonitor'
dscho
committed
2345937
Merge pull request #2837 from dscho/monitor-component-updates
dscho
committed
7c999f6
Merge 'readme' into HEAD
dscho
committed
1c5ccfa

Uh oh!

Commits

Commits on Feb 27, 2023