Rebase to v2.55.0 rc0#6278

Merged

gitforwindowshelper[bot] merged 815 commits into

git-for-windows:mainfrom

dscho:rebase-to-v2.55.0-rc0

Jun 12, 2026

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

Commits on Jun 11, 2026

t0014: fix indentation

jglathe
authored and
dscho
committed
git-gui: accommodate for intent-to-add files
dscho
committed
vcpkg_install: add comment regarding slow network connections

PhilipOakley
authored and
dscho
committed
Add schannel to curl installation

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

dennisameling
authored and
dscho
committed
mingw: allow for longer paths in `parse_interpreter()`
dscho
committed
compat/vcbuild: document preferred way to build in Visual Studio
dscho
committed
http: optionally send SSL client certificate

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

vdye
authored and
dscho
committed
CMake: show Win32 and Generator_platform build-option values

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

PhilipOakley
authored and
dscho
committed
mingw: stop hard-coding `CC = gcc`
dscho
committed
mingw: drop the -D_USE_32BIT_TIME_T option
dscho
committed
hash algorithms: use size_t for section lengths

PhilipOakley
authored and
dscho
committed
mingw: only use -Wl,--large-address-aware for 32-bit builds
dscho
committed
hash-object --stdin: verify that it works with >4GB/LLP64

PhilipOakley
authored and
dscho
committed
mingw: avoid over-specifying `--pic-executable`
dscho
committed
hash-object: add another >4GB/LLP64 test case

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

derrickstolee
authored and
dscho
committed
mingw: set the prefix and HOST_CPU as per MSYS2's settings
dscho
committed
hash-object: add a >4GB/LLP64 test case using filtered input

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

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

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

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

sunzhuoshi
and
dscho
committed
mingw: change core.fsyncObjectFiles = 1 by default
dscho
committed
MinGW: link as terminal server aware

rimrul
authored and
dscho
committed
Fix Windows version resources

Mortein
authored and
dscho
committed
status: fix for old-style submodules with commondir

sceptical-coder
authored and
dscho
committed
windows: skip linking `git-<command>` for built-ins
dscho
committed
Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
dscho
committed
clink.pl: fix libexpatd.lib link error when using MSVC

jeffhostetler
authored and
dscho
committed
Makefile: clean up .ilk files when MSVC=1

jeffhostetler
authored and
dscho
committed
vcbuild: add support for compiling Windows resource files

jeffhostetler
authored and
dscho
committed
mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
dscho
committed
config.mak.uname: add git.rc to MSVC builds

jeffhostetler
authored and
dscho
committed
http: optionally load libcurl lazily
dscho
committed
mingw: rely on MSYS2's metadata instead of hard-coding it
dscho
committed
mingw: ensure valid CTYPE
dscho
committed
clink.pl: ignore no-stack-protector arg on MSVC=1 builds

jeffhostetler
authored and
dscho
committed
http: support lazy-loading libcurl also on Windows
dscho
committed
mingw: always define `ETC_*` for MSYS2 environments
dscho
committed
mingw: allow `git.exe` to be used instead of the "Git wrapper"
dscho
committed
clink.pl: move default linker options for MSVC=1 builds

jeffhostetler
authored and
dscho
committed
http: when loading libcurl lazily, allow for multiple SSL backends
dscho
committed
max_tree_depth: lower it for clang builds in general on Windows
dscho
committed
mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
dscho
committed
cmake: install headless-git.

Berrysoft
authored and
dscho
committed
git.rc: include winuser.h

rimrul
authored and
dscho
committed
mingw: do load libcurl dynamically by default
dscho
committed
Add a GitHub workflow to verify that Git/Scalar work in Nano Server
dscho
committed
mingw: suggest `windows.appendAtomically` in more cases

dsl101
authored and
dscho
committed
win32: use native ANSI sequence processing, if possible
dscho
committed
common-main.c: fflush stdout buffer upon exit

chengzhuo5
authored and
dscho
committed
survey: stub in new experimental 'git-survey' command

authored and
dscho
committed
survey: add command line opts to select references

Jeff Hostetler
authored and
dscho
committed
survey: start pretty printing data in table form

derrickstolee
authored and
dscho
committed
survey: add object count summary

derrickstolee
authored and
dscho
committed
survey: summarize total sizes by object type

derrickstolee
authored and
dscho
committed
survey: show progress during object walk

derrickstolee
authored and
dscho
committed
mingw: make sure `errno` is set correctly when socket operations fail
dscho
committed
survey: add ability to track prioritized lists

authored and
dscho
committed
compat/mingw: handle WSA errors in strerror

rimrul
authored and
dscho
committed
t5563: verify that NTLM authentication works

dscho
and
mjcheetham
committed
survey: add report of "largest" paths

derrickstolee
authored and
dscho
committed
compat/mingw: drop outdated comment

rimrul
authored and
dscho
committed
http: disallow NTLM authentication by default
dscho
committed
survey: add --top=<N> option and config

derrickstolee
authored and
dscho
committed
t0301: actually test credential-cache on Windows

rimrul
authored and
dscho
committed
http: warn if might have failed because of NTLM
dscho
committed
t5601/t7406(mingw): do run tests with symlink support
dscho
committed
win32: ensure that `localtime_r()` is declared even in i686 builds
dscho
committed
Fallback to AppData if XDG_CONFIG_HOME is unset

ariellourenco
authored and
dscho
committed
run-command: be helpful with Git LFS fails on Windows 7
dscho
committed
revision: create mark_trees_uninteresting_dense()

derrickstolee
authored and
dscho
committed
survey: clearly note the experimental nature in the output
dscho
committed
credential-cache: handle ECONNREFUSED gracefully

rimrul
authored and
dscho
committed
reftable: do make sure to use custom allocators
dscho
committed
check-whitespace: avoid alerts about upstream commits
dscho
committed
t/t5571-prep-push-hook.sh: Add test with writing to stderr

t-b
authored and
dscho
committed
credential: advertise NTLM suppression and allow helpers to re-enable
dscho
committed
dir: do not traverse mount points

maks244
authored and
dscho
committed
Merge 'remote-hg-prerequisites' into HEAD
dscho
committed
Merge branch 'drive-prefix'
dscho
committed
mingw: introduce code to detect whether we're inside a Windows container

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

piscisaureus
authored and
dscho
committed
Merge branch 'msys2-python'
dscho
committed
mingw: Support `git_terminal_prompt` with more terminals

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

zcube
authored and
dscho
committed
Introduce helper to create symlinks that knows about index_state
dscho
committed
Merge pull request #2375 from assarbad/reintroduce-sideband-config
dscho
committed
compat/terminal.c: only use the Windows console if bash 'read -r' fails

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

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

piscisaureus
authored and
dscho
committed
clean: do not traverse mount points
dscho
committed
mingw: kill child processes in a gentler way
dscho
committed
Merge pull request #2488 from bmueller84/master
dscho
committed
win32: thread-utils: handle multi-socket systems

authored and
dscho
committed
t5563: add tests for http.emptyAuth with Negotiate

mjcheetham
authored and
dscho
committed
entry: flush fscache after creating directories and writing files

tyrielv
authored and
dscho
committed
ci(macos): skip the `git p4` tests
dscho
committed
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho
committed
mingw: Windows Docker volumes are *not* symbolic links
dscho
committed
mingw: work around rename() failing on a read-only file

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

piscisaureus
authored and
dscho
committed
clean: remove mount points when possible
dscho
committed
mingw: optionally enable wsl compability file mode bits

swigger
authored and
dscho
committed
mingw: really handle SIGINT
dscho
committed
Merge pull request #2501 from jeffhostetler/clink-debug-curl
dscho
committed
Merge pull request #2504 from dscho/access-repo-via-junction
dscho
committed
Merge pull request #2535 from dscho/schannel-revoke-best-effort
dscho
committed
Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
dscho
committed
Merge 'add-p-many-files'
dscho
committed
Merge pull request #2714 from lbonanomi/crlf-scissors
dscho
committed
Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
dscho
committed
Merge 'git-gui/js/intent-to-add'
dscho
committed
Merge pull request #2351 from PhilipOakley/vcpkg-tip
dscho
committed
Merge pull request #2915 from dennisameling/windows-arm64-support
dscho
committed
Merge pull request #3327 from dennisameling/fix-host-cpu
dscho
committed
Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path
dscho
committed
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
dscho
committed
Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate
dscho
committed
Merge pull request #3349 from vdye/feature/ci-subtree-tests
dscho
committed
Merge pull request #3306 from PhilipOakley/vs-sln
dscho
committed
Merge pull request #3533 from PhilipOakley/hashliteral_t
dscho
committed
Merge pull request #3791: Various fixes around `safe.directory`

derrickstolee
authored and
dscho
committed
Merge pull request #3751 from rkitover/native-term
dscho
committed
Merge pull request #3875 from 1480c1/wine/detect_msys_tty
dscho
committed
Merge branch 'optionally-dont-append-atomically-on-windows'
dscho
committed
Merge branch 'fsync-object-files-always'
dscho
committed
Merge pull request #3942 from rimrul/mingw-tsaware
dscho
committed
Fix Windows version resources (#4092)
dscho
committed
Fix global repository field not being cleared (#4083)
dscho
committed
Skip linking the "dashed" `git-<command>`s for built-ins (#4252)
dscho
committed
Add full `mingw-w64-git` (i.e. regular MSYS2 ecosystem) support (#5971)
dscho
committed
Merge pull request #2506 from dscho/issue-2283
dscho
committed
Merge pull request #2974 from derrickstolee/maintenance-and-headless
dscho
committed
ARM64: Embed manifest properly (#4718)
dscho
committed
Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (#4410)
dscho
committed
Merge branch 'nano-server'
dscho
committed
Additional error checks for issuing the windows.appendAtomically warning (#4528)
dscho
committed
win32: use native ANSI sequence processing, if possible (#4700)
dscho
committed
common-main.c: fflush stdout buffer when exit (#4901)
dscho
committed
Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
dscho
committed
Merge branch 'Fix-i686-build-with-GCC-v14'
dscho
committed
Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
dscho
committed
Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
dscho
committed
Add path walk API and its use in 'git pack-objects' (#5171)

derrickstolee
authored and
dscho
committed
Add experimental 'git survey' builtin (#5174)
dscho
committed
credential-cache: handle ECONNREFUSED gracefully (#5329)
dscho
committed
Merge branch 'reftable-vs-custom-allocators'
dscho
committed
Merge branch 'check-whitespace-only-downstream'
dscho
committed
t/t5571-prep-push-hook.sh: Add test with writing to stderr (#6063)
dscho
committed
Merge branch 'disallow-ntlm-auth-by-default'
dscho
committed
Don't traverse mount points in `remove_dir_recurse()` (#6151)
dscho
committed
Detect number of cores better on multi-socket systems (#6108)
dscho
committed
http: fix emptyAuth=auto for Negotiate/SPNEGO (#6170)
dscho
committed
entry: flush fscache after creating directories and writing files (#6250)
dscho
committed
ci(macos): skip the `git p4` tests (#5954)
dscho
committed
Merge branch 'msys2'
dscho
committed
Merge 'docker-volumes-are-no-symlinks'
dscho
committed
mingw: try resetting the read-only bit if rename fails (#4527)
dscho
committed
Merge pull request #1897 from piscisaureus/symlink-attr
dscho
committed
Merge branch 'dont-clean-junctions'
dscho
committed
Merge branch 'wsl-file-mode-bits'
dscho
committed
Merge pull request #1170 from dscho/mingw-kill-process
dscho
committed
Win32: make FILETIME conversion functions public

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

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

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

kblees
authored and
dscho
committed
mingw: add infrastructure for read-only file system level caches

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

kblees
authored and
dscho
committed
fscache: load directories only once

kblees
authored and
dscho
committed
fscache: add key for GIT_TRACE_FSCACHE

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

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

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

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

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

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

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

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

benpeart
authored and
dscho
committed
git-gui--askyesno: fix funny text wrapping
dscho
committed
fscache: use FindFirstFileExW to avoid retrieving the short name

benpeart
authored and
dscho
committed
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho
committed
Merge branch 'ready-for-upstream'
dscho
committed
mem_pool: add GIT_TRACE_MEMPOOL support

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

benpeart
authored and
dscho
committed
fscache: add GIT_TEST_FSCACHE support

benpeart
authored and
dscho
committed
fscache: remember the reparse tag for each entry
dscho
committed
fscache: update fscache to be thread specific instead of global

benpeart
authored and
dscho
committed
fscache: add fscache hit statistics

benpeart
authored and
dscho
committed
fscache: Windows Docker volumes are *not* symbolic links
dscho
committed
fscache: teach fscache to use mempool

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

derrickstolee
authored and
dscho
committed
fscache: optionally enable wsl compability file mode bits

swigger
authored and
dscho
committed
fscache: make fscache_enable() thread safe

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

benpeart
authored and
dscho
committed
Merge branch 'fscache'
dscho
committed
fscache: implement an FSCache-aware is_mount_point()
dscho
committed
fscache: teach fscache to use NtQueryDirectoryFile

benpeart
authored and
dscho
committed
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho
committed
clean: make use of FSCache
dscho
committed
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho
committed
Merge branch 'dont-clean-junctions-fscache'
dscho
committed
pack-objects (mingw): demonstrate a segmentation fault with large deltas

vangdfang
authored and
dscho
committed
mingw: explicitly specify with which cmd to prefix the cmdline
dscho
committed
mingw: support long paths

kblees
authored and
dscho
committed
mingw: when path_lookup() failed, try BusyBox
dscho
committed
win32(long path support): leave drive-less absolute paths intact
dscho
committed
test-tool: learn to act as a drop-in replacement for `iconv`
dscho
committed
compat/fsmonitor/fsm-*-win32: support long paths

jeffhostetler
authored and
dscho
committed
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho
committed
clean: suggest using `core.longPaths` if paths are too long to remove

mathstuf
authored and
dscho
committed
gitattributes: mark .png files as binary
dscho
committed
tests: move test PNGs into t/lib-diff/
dscho
committed
tests: only override sort & find if there are usable ones in /usr/bin/
dscho
committed
tests: use the correct path separator with BusyBox
dscho
committed
mingw: only use Bash-ism `builtin pwd -W` when available
dscho
committed
Describe Git for Windows' architecture
dscho
committed
tests (mingw): remove Bash-specific pwd option
dscho
committed
Add an AGENTS.md file to help with AI-assisted debugging/development
dscho
committed
test-lib: add BUSYBOX prerequisite
dscho
committed
Modify the Code of Conduct for Git for Windows
dscho
committed
t5003: use binary file from t/lib-diff/
dscho
committed
CONTRIBUTING.md: add guide for first-time contributors

derrickstolee
authored and
dscho
committed
t5532: workaround for BusyBox on Windows
dscho
committed
README.md: Add a Windows-specific preamble
dscho
committed
t5605: special-case hardlink test for BusyBox-w32
dscho
committed
Add an issue template

shiftkey
authored and
dscho
committed
t5813: allow for $PWD to be a Windows path
dscho
committed
Add a GitHub workflow to monitor component updates

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

Philip Oakley
authored and
dscho
committed
Merge branch 'gitk-and-git-gui-patches'
dscho
committed
t9200: skip tests when $PWD contains a colon
dscho
committed
Partially un-revert "editor: save and reset terminal after calling EDITOR"
dscho
committed
reset: reinstate support for the deprecated --stdin option
dscho
committed
fsmonitor: reintroduce core.useBuiltinFSMonitor

vdye
authored and
dscho
committed
dependabot: help keeping GitHub Actions versions up to date
dscho
committed
SECURITY.md: document Git for Windows' policies
dscho
committed
Merge branch 'long-paths'
dscho
committed
Merge branch 'busybox-w32'
dscho
committed
Merge branch 'un-revert-editor-save-and-reset'
dscho
committed
Merge branch 'phase-out-reset-stdin'
dscho
committed
Merge branch 'deprecate-core.useBuiltinFSMonitor'
dscho
committed
Merge pull request #2837 from dscho/monitor-component-updates
dscho
committed
Merge 'readme' into HEAD
dscho
committed

Commits on Jun 12, 2026

Merge 'objects-larger-than-4gb-on-windows-pt2'
dscho
committed
ci: only run the expensive tests in the Windows tests for now
dscho
committed