Skip to content

Rebase to Git v2.56.0-rc2 - #6431

Merged
dscho merged 330 commits into
git-for-windows:mainfrom
dscho:rebase-to-v2.56.0-rc2
Sep 22, 2026
Merged

dscho merged 330 commits into
git-for-windows:mainfrom
dscho:rebase-to-v2.56.0-rc2

Conversation

@dscho

@dscho dscho commented Sep 22, 2026

Copy link
Copy Markdown
Member
Range-diff relative to main
  • 1: 754cba0 = 1: a73e1c1 unix-socket: avoid leak when initialization fails

  • 2: 678d85c = 2: 89b36b4 grep: prevent ^$ false match at end of file

  • 3: c12cea0 = 3: 45c1cb5 ci: bump actions/checkout from 6 to 7

  • 17: e370b43 = 4: 9937e15 ci(vs-build): adapt to Visual Studio 2026 default on windows-latest

  • 18: d66cb29 = 5: b0907ff vcpkg_install: detect lack of Git

  • 19: f6d13f2 = 6: 4b66d1e vcpkg_install: add comment regarding slow network connections

  • 20: fafe5a8 = 7: 4907c51 vcbuild: install ARM64 dependencies when building ARM64 binaries

  • 21: 38eedf0 = 8: a09a887 vcbuild: add an option to install individual 'features'

  • 22: bde85a0 = 9: 3af5700 cmake: allow building for Windows/ARM64

  • 4: 355b93c = 10: 0adc558 t9350: point out that refs are not updated correctly

  • 23: ab4eee0 = 11: e2da5dd ci(vs-build) also build Windows/ARM64 artifacts

  • 5: ed08414 = 12: 1cc4970 transport-helper: add trailing --

  • 9: cf9a73b = 13: 7c1b374 mingw: demonstrate a git add issue with NTFS junctions

  • 11: 04d9a98 = 14: 971600e t5505/t5516: allow running without .git/branches/ in the templates

  • 24: 83aeb46 = 15: 7e8f7e3 vcbuild: stop hard-coding OpenSSL as a dependency

  • 6: 1f837ee = 16: 7931f66 remote-helper: check helper status after import/export

  • 10: c5bd4d4 = 17: 0c7d60f strbuf_realpath(): use platform-dependent API if available

  • 12: 502aeed = 18: f5d1d9a http: use new "best effort" strategy for Secure Channel revoke checking

  • 29: 795bca0 = 19: 64b38da t5505/t5516: fix white-space around redirectors

  • 25: 08d112e = 20: d9c031c cmake(): allow setting HOST_CPU for cross-compilation

  • 7: b13b782 = 21: 1852246 Always auto-gc after calling a fast-import transport

  • 8: 274dd26 = 22: 15cf248 mingw: prevent regressions with "drive-less" absolute paths

  • 13: c332cc8 = 23: 8d7620f transport: optionally disable side-band-64k

  • 14: b7565a1 = 24: 2c66260 mingw: fix fatal error working on mapped network drives on Windows

  • 15: e09e19f = 25: 887624f clink.pl: fix MSVC compile script to handle libcurl-d.lib

  • 16: d0443a4 = 26: c37602f mingw: implement a platform-specific strbuf_realpath()

  • 30: ede430b = 27: bbdd884 t3701: verify that we can add lots of files interactively

  • 31: 99c7fcc = 28: 25e2373 commit: accept "scissors" with CR/LF line endings

  • 32: 2aaca00 = 29: 7e16843 t0014: fix indentation

  • 33: 1277039 = 30: d193441 git-gui: accommodate for intent-to-add files

  • 34: 46bb937 = 31: cc043cd mingw: allow for longer paths in parse_interpreter()

  • 35: 1a3225a = 32: dbdd754 compat/vcbuild: document preferred way to build in Visual Studio

  • 36: fcbbb5c = 33: 80fffae http: optionally send SSL client certificate

  • 59: 0579db0 = 34: 29d10ba revision: create mark_trees_uninteresting_dense()

  • 60: c5e699a = 35: 449129f survey: stub in new experimental 'git-survey' command

  • 61: f77af3e = 36: 41efe39 survey: add command line opts to select references

  • 62: e6ecc1d = 37: 9879d43 survey: start pretty printing data in table form

  • 63: 78f658f = 38: 08058a8 survey: add object count summary

  • 49: 14cc7c2 = 39: eafa7f2 max_tree_depth: lower it for clang builds in general on Windows

  • 64: 7506a25 = 40: 42666ba survey: summarize total sizes by object type

  • 50: f9af1e6 = 41: 0400e01 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

  • 65: 2c98158 = 42: a20a707 survey: show progress during object walk

  • 67: 4de9159 = 43: 268f299 survey: add ability to track prioritized lists

  • 51: 3071c60 = 44: 4b4c054 clink.pl: fix libexpatd.lib link error when using MSVC

  • 69: 7f768ee = 45: 1c567c7 survey: add report of "largest" paths

  • 52: 9fdd83d = 46: dae9865 Makefile: clean up .ilk files when MSVC=1

  • 71: 94309ac = 47: 3d2c6a5 survey: add --top= option and config

  • 53: 8f86185 = 48: 2f0cedd vcbuild: add support for compiling Windows resource files

  • 87: a38c1ba = 49: fa3f2b3 survey: clearly note the experimental nature in the output

  • 54: 33e78c8 = 50: c19160e config.mak.uname: add git.rc to MSVC builds

  • 41: 3dd17ad = 51: f19ea3e MinGW: link as terminal server aware

  • 213: 55c1c90 = 52: b285614 repo: split annotated tags out from total tag count in structure

  • 26: 7df180b = 53: 79f6f5b CMake: default Visual Studio generator has changed

  • 55: 17103b2 = 54: d8eeeb7 clink.pl: ignore no-stack-protector arg on MSVC=1 builds

  • 66: 9698a36 = 55: 00ac3cf http: optionally load libcurl lazily

  • 214: d8b024a = 56: 097e00c repo: filter the structure scope via --ref-filter=

  • 28: 1842ee0 = 57: 54c9240 .gitignore: add Visual Studio CMakeSetting.json file

  • 56: c38cfbb = 58: 12082b6 clink.pl: move default linker options for MSVC=1 builds

  • 68: c997ec6 = 59: 59f30b4 http: support lazy-loading libcurl also on Windows

  • 215: c3a125f = 60: 5ef1ddb repo: report top-N paths by count, disk, and inflated size in structure

  • 27: 3a689df = 61: 7cab29d subtree: update contrib/subtree test target

  • 38: 13e7fd0 = 62: 673eee7 CMakeLists: add default "x64-windows" arch for Visual Studio

  • 39: c8516d0 = 63: 8e9d9b1 setup: properly use "%(prefix)/" when in WSL

  • 40: 5057d5b = 64: ac21711 Add config option windows.appendAtomically

  • 57: 583c301 = 65: 1b40277 cmake: install headless-git.

  • 70: bdd225d = 66: 51df1cb http: when loading libcurl lazily, allow for multiple SSL backends

  • 216: 9813912 = 67: 2525495 t1901: cover the --top option of git repo structure

  • 37: 7d92acc = 68: 602d379 ci: run contrib/subtree tests in CI builds

  • 42: 2ca9f3f = 69: ec2d27c CMake: show Win32 and Generator_platform build-option values

  • 43: 2114563 = 70: ca64a50 compat/mingw.c: do not warn when failing to get owner

  • 44: 976161f = 71: 274d843 mingw: $env:TERM="xterm-256color" for newer OSes

  • 45: c4cd431 = 72: 85715ca winansi: check result and Buffer before using Name

  • 46: b92c9ec = 73: fe6281d mingw: change core.fsyncObjectFiles = 1 by default

  • 47: f69cbee = 74: 5968f6f Fix Windows version resources

  • 48: 9f658eb = 75: a59b224 status: fix for old-style submodules with commondir

  • 58: 03698ce = 76: b6d4110 git.rc: include winuser.h

  • 72: a6c8b80 = 77: 3910656 mingw: do load libcurl dynamically by default

  • 73: 2a0fc30 = 78: 5bb4571 Add a GitHub workflow to verify that Git/Scalar work in Nano Server

  • 74: e3bf9fa = 79: 472a2e9 mingw: suggest windows.appendAtomically in more cases

  • 75: a3e2688 = 80: f5d88e8 win32: use native ANSI sequence processing, if possible

  • 76: f33c7ee = 81: 9f1e598 common-main.c: fflush stdout buffer upon exit

  • 77: 2dd37dd = 82: 8311b2a t5601/t7406(mingw): do run tests with symlink support

  • 78: e402090 = 83: de1220f Fallback to AppData if XDG_CONFIG_HOME is unset

  • 97: 730b882 = 84: 044da41 mingw: Support git_terminal_prompt with more terminals

  • 98: 5a12a29 = 85: cd8b1cd compat/terminal.c: only use the Windows console if bash 'read -r' fails

  • 100: 3931834 = 86: d7e9f93 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

  • 102: 10066e1 = 87: 9b88fc0 Win32: symlink: move phantom symlink creation to a separate function

  • 79: 6799845 = 88: 23153f2 mingw: make sure errno is set correctly when socket operations fail

  • 80: af474ff = 89: 7bc4539 t5563: verify that NTLM authentication works

  • 104: 315dc44 = 90: d3b36b6 mingw: introduce code to detect whether we're inside a Windows container

  • 105: 2476d27 = 91: 2cd4411 Introduce helper to create symlinks that knows about index_state

  • 81: 7f92921 = 92: c24ffdb compat/mingw: handle WSA errors in strerror

  • 82: fba06e2 = 93: 20f786f http: disallow NTLM authentication by default

  • 107: e4c50ba = 94: b39ed59 mingw: when running in a Windows container, try to rename() harder

  • 108: 460d669 = 95: eeb433a mingw: allow to specify the symlink type in .gitattributes

  • 217: ff71a9e = 96: 723dbfc repo: read the --top default from repo.structure.top

  • 83: 036020c = 97: ca42679 compat/mingw: drop outdated comment

  • 84: d06273b = 98: 33f90b6 http: warn if might have failed because of NTLM

  • 110: a1432ff = 99: 7cc77ef mingw: move the file_attr_to_st_mode() function definition

  • 111: 8d8772d = 100: b843919 Win32: symlink: add test for symlink attribute

  • 99: 87020bd = 101: 313944e diff: stop truncating the deflated-binary-diff size on Windows

  • 218: 44ad347 = 102: bade7fe git-survey: announce the upcoming pivot into git repo structure

  • 85: 2aa7722 = 103: f8867c8 t0301: actually test credential-cache on Windows

  • 86: febbabf = 104: 7ffa37e credential: advertise NTLM suppression and allow helpers to re-enable

  • 113: 1492afb = 105: 9399428 mingw: Windows Docker volumes are not symbolic links

  • 114: dfc18a4 = 106: 0ea6ccc clean: do not traverse mount points

  • 101: 3e08cb8 = 107: be3cb5b convert: widen gather_convert_stats() helpers to size_t

  • 115: 886f3a6 = 108: de05fff pack-bitmap: stop truncating blob sizes used by --filter=blob:limit

  • 219: f817e4e = 109: 72db98d survey: turn into a thin shim over git repo structure

  • 88: 4afef9d = 110: fe249c6 credential-cache: handle ECONNREFUSED gracefully

  • 89: 4f80422 = 111: 1999ee3 reftable: do make sure to use custom allocators

  • 90: ca57818 = 112: 1f80dc2 check-whitespace: avoid alerts about upstream commits

  • 91: 2017cd0 = 113: ea0f1ea t/t5571-prep-push-hook.sh: Add test with writing to stderr

  • 92: 3b701aa = 114: 29e08e0 dir: do not traverse mount points

  • 93: aea2858 = 115: 441a7db win32: thread-utils: handle multi-socket systems

  • 94: f29e89e = 116: 50ecacd t5563: add tests for http.emptyAuth with Negotiate

  • 95: e2e75ee = 117: fd5685c entry: flush fscache after creating directories and writing files

  • 96: 702162c = 118: 15bf413 ci(macos): skip the git p4 tests

  • 117: 99e9402 = 119: 45f5357 mingw: work around rename() failing on a read-only file

  • 118: 3a34271 = 120: d730f18 clean: remove mount points when possible

  • 119: 9787498 = 121: 3ac681b mingw: optionally enable wsl compability file mode bits

  • 120: bc66e69 = 122: a562b12 Refuse to follow invalid paths in .git files

  • 103: 6bdca9f = 123: 27ae74f read-cache: stop truncating index blob sizes on Windows

  • 106: 569e285 = 124: c25b61b xdiff-interface: widen buffer_is_binary() size parameter to size_t

  • 121: 6e36bd4 = 125: 58d8220 tree-walk: drop link_len cast in get_tree_entry_follow_symlinks()

  • 109: 6a59761 = 126: 3509e65 combine-diff: stop truncating combined-diff blob sizes on Windows

  • 122: cb02f7e = 127: 60d0d57 tree-walk: widen init_tree_desc() and init_tree_desc_gently() to size_t

  • 112: 61073ba = 128: 4e61a46 diff: widen textconv_object() size out-param to size_t

  • 123: e3bf662 = 129: 88cb329 pack-objects: drop the two tree-walk casts in the preferred-base path

  • 116: a745e1a = 130: 65e6e52 diffcore: widen struct diff_filespec.size to size_t

  • 124: 83f1174 = 131: 5214aed tree: widen struct tree.size and parse_tree_buffer() to size_t

  • 125: 85ba3dc = 132: b579c51 commit: widen the commit-buffer API to size_t

  • 126: 0e2bdb4 = 133: d71fec1 blame: widen find_line_starts() len parameter to size_t

  • 127: 311bfc4 = 134: e553556 grep: widen struct grep_source.size and grep_buffer() to size_t

  • 128: 5277a7d = 135: fbe1028 fast-export: drop the export_blob() size cast and widen anonymize_blob()

  • 129: 65e68af = 136: 539b860 repo: drop the inflated-size cast in count_objects()

  • 130: 663bbac = 137: 4a2e6c8 unpack-objects: widen the size-passing infrastructure to size_t

  • 131: 5321d03 = 138: 2b7de9d pack-objects: drop cast_size_t_to_ulong shims in get_delta()

  • 132: 33f006c = 139: 0163ad2 pack-objects: drop cast_size_t_to_ulong shims in try_delta()

  • 133: 5f203b9 = 140: d1d3953 pack-objects: drop the last size shim in write_no_reuse_object()

  • 134: 72ba09c = 141: 038ea25 blame: widen struct blame_scoreboard.final_buf_size to size_t

  • 135: 675c04b = 142: 1f68ecd fast-import: drop the six size casts in the object-read paths

  • 136: 83a745e = 143: 926d9b9 t/helper/test-pack-deltas: drop the delta_size cast in write_ref_delta()

  • 137: 09dc308 = 144: 6624c24 Drop the cast_size_t_to_ulong() helper

  • 220: 3ad7429 = 145: 8289f17 mingw: handle staging 4GB+ files correctly

  • 221: 2eb1516 = 146: 894720f mingw: support unpacking loose 4GB+ objects

  • 222: 8c04941 = 147: a88fef0 bundle-uri: refuse advertised URIs by protocol

  • 223: 3e9d097 = 148: 5152ad5 t: add an expensive test to verify that 4GB+ blobs can be staged/read

  • 225: d3367bb = 149: 6c20199 object-file: use size_t for object size in check_object_signature()

  • 138: dc35b32 = 150: fde0edc coverity: skip building with Rust, for now

  • 212: a867bca ! 151: c117a50 build(deps): bump actions/cache from 5 to 6

    @@
      ## Metadata ##
    -Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    +Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
     
      ## Commit message ##
    -    build(deps): bump actions/cache from 5 to 6
    +    ci(coverity): bump actions/cache from 5 to 6
     
    -    Bumps [actions/cache](https://github.com/actions/cache) from 5 to 6.
    -    - [Release notes](https://github.com/actions/cache/releases)
    -    - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
    -    - [Commits](https://github.com/actions/cache/compare/v5...v6)
    +    This update only means that the Action is now an ECMAScript module, no
    +    functional changes implied.
     
    -    ---
    -    updated-dependencies:
    -    - dependency-name: actions/cache
    -      dependency-version: '6'
    -      dependency-type: direct:production
    -      update-type: version-update:semver-major
    -    ...
    -
    -    Signed-off-by: dependabot[bot] <support@github.com>
    +    Originally-authored-by: dependabot[bot] <support@github.com>
    +    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
     
      ## .github/workflows/coverity.yml ##
     @@ .github/workflows/coverity.yml: jobs:
  • 139: 049c002 = 152: 95fab75 Win32: make FILETIME conversion functions public

  • 140: b03e5d5 = 153: a27940a Win32: dirent.c: Move opendir down

  • 141: 3a14b18 = 154: 304831d mingw: make the dirent implementation pluggable

  • 142: 068cea9 = 155: 901f5e5 Win32: make the lstat implementation pluggable

  • 143: dedcced = 156: 2874977 mingw: add infrastructure for read-only file system level caches

  • 144: 1747e4e = 157: 9f8bdf8 mingw: add a cache below mingw's lstat and dirent implementations

  • 145: 95fbf1a = 158: 7b99a25 fscache: load directories only once

  • 146: 00c0a77 = 159: d4a7669 fscache: add key for GIT_TRACE_FSCACHE

  • 147: 67dd5ad = 160: 3fa0981 fscache: remember not-found directories

  • 148: 6a1c52c = 161: 4e3e6c9 fscache: add a test for the dir-not-found optimization

  • 149: 6e49c48 = 162: 8e337d5 add: use preload-index and fscache for performance

  • 150: ad0ef00 = 163: 1d63485 dir.c: make add_excludes aware of fscache during status

  • 151: e4d8335 = 164: 20b158c fscache: make fscache_enabled() public

  • 152: 2bb973d = 165: 2b4648d dir.c: regression fix for add_excludes with fscache

  • 153: e0fa286 = 166: a0665c0 fetch-pack.c: enable fscache for stats under .git/objects

  • 154: b72bb53 = 167: 6d4d8b9 checkout.c: enable fscache for checkout again

  • 155: 93e8021 = 168: d008930 Enable the filesystem cache (fscache) in refresh_index().

  • 156: 6f5fa12 = 169: c59111e fscache: use FindFirstFileExW to avoid retrieving the short name

  • 157: f621f94 = 170: 8d9ee24 fscache: add GIT_TEST_FSCACHE support

  • 158: d0f69bb = 171: 108ea41 fscache: add fscache hit statistics

  • 159: 63dc7c7 = 172: 14c4147 unpack-trees: enable fscache for sparse-checkout

  • 160: 8c52147 = 173: 9770ce3 status: disable and free fscache at the end of the status command

  • 161: 344bba4 = 174: 45082e0 mem_pool: add GIT_TRACE_MEMPOOL support

  • 162: f31d9f4 = 175: 99f5488 fscache: fscache takes an initial size

  • 163: 1848982 = 176: 3c9f0d2 fscache: update fscache to be thread specific instead of global

  • 164: 01227b5 = 177: 6ca4f70 fscache: teach fscache to use mempool

  • 165: 8f45216 = 178: 381273b fscache: make fscache_enable() thread safe

  • 167: 8925b91 = 179: 4485beb fscache: teach fscache to use NtQueryDirectoryFile

  • 169: 7b7da94 = 180: 9f4f94f fscache: remember the reparse tag for each entry

  • 170: 3e774e2 = 181: 3fc3da7 fscache: Windows Docker volumes are not symbolic links

  • 171: 6749f92 = 182: 6cd6b7e fscache: optionally enable wsl compability file mode bits

  • 172: 19bd15d = 183: ac4e576 fscache: implement an FSCache-aware is_mount_point()

  • 173: c579e9d = 184: 9245fdb clean: make use of FSCache

  • 174: 1539298 = 185: b5ebc87 compat/poll: do not collect more handles than the wait supports

  • 175: 9661f9f = 186: f2d8b80 parallel-checkout: limit worker count to what poll() can wait on

  • 166: aa5decf = 187: 976d316 git-gui--askyesno: fix funny text wrapping

  • 176: 3e36718 = 188: 31aa5a0 run-command: limit concurrent children to what poll() can wait on

  • 168: ab2931c = 189: c2fb3f1 git-gui--askyesno (mingw): use Git for Windows' icon, if available

  • 177: 79ce8ad = 190: 26eee36 pack-objects (mingw): demonstrate a segmentation fault with large deltas

  • 178: 628d259 = 191: 939b27d mingw: support long paths

  • 179: 4212838 = 192: 81d8125 win32(long path support): leave drive-less absolute paths intact

  • 180: cbd1932 = 193: ff34f17 compat/fsmonitor/fsm-*-win32: support long paths

  • 181: e2116de = 194: 3c843a7 clean: suggest using core.longPaths if paths are too long to remove

  • 182: 706c4a8 = 195: 9bf1cbc mingw: explicitly specify with which cmd to prefix the cmdline

  • 183: 5228e53 = 196: 1540174 mingw: when path_lookup() failed, try BusyBox

  • 184: f187b3d = 197: 6cfcd53 test-tool: learn to act as a drop-in replacement for iconv

  • 185: 5fd8e3c = 198: 83c7552 tests(mingw): if iconv is unavailable, use test-helper --iconv

  • 186: 09950ae = 199: e74af57 gitattributes: mark .png files as binary

  • 187: 9825f87 = 200: 3f7a5b2 tests: move test PNGs into t/lib-diff/

  • 188: 1515650 = 201: c7d121d tests: only override sort & find if there are usable ones in /usr/bin/

  • 189: 227932d = 202: 646dc04 tests: use the correct path separator with BusyBox

  • 190: f225e23 = 203: 1f408d8 mingw: only use Bash-ism builtin pwd -W when available

  • 191: 4533660 = 204: 359d0f4 tests (mingw): remove Bash-specific pwd option

  • 192: 75adc21 = 205: 12dd122 test-lib: add BUSYBOX prerequisite

  • 193: 4b6c43d = 206: be0fd61 t5003: use binary file from t/lib-diff/

  • 194: b2b8ff8 = 207: 13189fc t5532: workaround for BusyBox on Windows

  • 195: 82efda6 = 208: 6d5e629 t5605: special-case hardlink test for BusyBox-w32

  • 196: c784721 = 209: 33fd268 t5813: allow for $PWD to be a Windows path

  • 197: b741dfa = 210: 7155f3b t9200: skip tests when $PWD contains a colon

  • 202: b459b83 = 211: 2044525 Describe Git for Windows' architecture

  • 203: ab83bc1 = 212: f418bf5 Add an AGENTS.md file to help with AI-assisted debugging/development

  • 204: df5b552 = 213: 5006edd Modify the Code of Conduct for Git for Windows

  • 205: c84f374 = 214: 33d9196 CONTRIBUTING.md: add guide for first-time contributors

  • 206: 7b76f21 = 215: 11eacac README.md: Add a Windows-specific preamble

  • 207: ce8640e = 216: 6c865a2 Add an issue template

  • 208: ae6ae62 = 217: 650d98e Modify the GitHub Pull Request template (to reflect Git for Windows)

  • 199: 1f2bf4a = 218: a3859a9 Add a GitHub workflow to monitor component updates

  • 209: c6a0a27 = 219: 9fd2001 SECURITY.md: document Git for Windows' policies

  • 198: 7d53bf2 = 220: df6405c Partially un-revert "editor: save and reset terminal after calling EDITOR"

  • 200: 8fd6c76 = 221: aff1770 reset: reinstate support for the deprecated --stdin option

  • 201: fb77a27 = 222: 6a49079 fsmonitor: reintroduce core.useBuiltinFSMonitor

  • 210: 107b4a2 = 223: 8a605f2 dependabot: help keeping GitHub Actions versions up to date

  • 211: 7bf8c9c = 224: ff60bb8 ci: only run the expensive tests in the Windows tests for now

  • 224: 889707a < -: ----------- git-for-windows: prepare for 2.55.0(5)

Nice and easy, I only reworded a Dependabot's commit message and dropped an empty commit.

dscho and others added 30 commits September 22, 2026 20:58
From the documentation of said setting:

	This boolean will enable fsync() when writing object files.

	This is a total waste of time and effort on a filesystem that
	orders data writes properly, but can be useful for filesystems
	that do not use journalling (traditional UNIX filesystems) or
	that only journal metadata and not file contents (OS X’s HFS+,
	or Linux ext3 with "data=writeback").

The most common file system on Windows (NTFS) does not guarantee that
order, therefore a sudden loss of power (or any other event causing an
unclean shutdown) would cause corrupt files (i.e. files filled with
NULs). Therefore we need to change the default.

Note that the documentation makes it sound as if this causes really bad
performance. In reality, writing loose objects is something that is done
only rarely, and only a handful of files at a time.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Whith Windows 2000, Microsoft introduced a flag to the PE header to mark executables as
"terminal server aware". Windows terminal servers provide a redirected Windows directory and
redirected registry hives when launching legacy applications without this flag set. Since we
do not use any INI files in the Windows directory and don't write to the registry, we don't
need  this additional preparation. Telling the OS that we don't need this should provide
slightly improved startup times in terminal server environments.

When building for supported Windows Versions with MSVC the /TSAWARE linker flag is
automatically set, but MinGW requires us to set the --tsaware flag manually.

This partially addresses git-for-windows#3935.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Add FileVersion, which is a required field
As not all required fields were present, none were being included
Fixes git-for-windows#4090

Signed-off-by: Kiel Hurley <kielhurley@gmail.com>
In f9b7573 (repository: free fields before overwriting them,
2017-09-05), Git was taught to release memory before overwriting it, but
357a03e (repository.c: move env-related setup code back to
environment.c, 2018-03-03) changed the code so that it would not
_always_ be overwritten.

As a consequence, the `commondir` attribute would point to
already-free()d memory.

This seems not to cause problems in core Git, but there are add-on
patches in Git for Windows where the `commondir` attribute is
subsequently used and causing invalid memory accesses e.g. in setups
containing old-style submodules (i.e. the ones with a `.git` directory
within theirs worktrees) that have `commondir` configured.

This fixes git-for-windows#4083.

Signed-off-by: Andrey Zabavnikov <zabavnikov@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 436a422 (max_tree_depth: lower it for clangarm64 on Windows,
2025-04-23), I provided a work-around for a nasty issue with clangarm
builds, where the stack is exhausted before the maximal tree depth is
reached, and the resulting error cannot easily be handled by Git
(because it would require Windows-specific handling).

Turns out that this is not at all limited to ARM64. In my tests with
CLANG64 in MSYS2 on the GitHub Actions runners, the test t6700.4 failed
in the exact same way. What's worse: The limit needs to be quite a bit
lower for x86_64 than for aarch64. In aforementioned tests, the breaking
point was 1232: With 1231 it still worked as expected, with 1232 it
would fail with the `STATUS_STACK_OVERFLOW` incorrectly mapped to exit
code 127. For comparison, in my tests on GitHub Actions' Windows/ARM64
runners, the breaking point was 1439 instead.

Therefore the condition needs to be adapted once more, to accommodate
(with some safety margin) both aarch64 and x86_64 in clang-based builds
on Windows, to let that test pass.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ctory

Internally, Git expects the environment variable `HOME` to be set, and
to point to the current user's home directory.

This environment variable is not set by default on Windows, and
therefore Git tries its best to construct one if it finds `HOME` unset.

There are actually two different approaches Git tries: first, it looks
at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate
environments with roaming profiles, and a user generally wants their
global Git settings to be in a roaming profile.

Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a
valid location, Git will fall back to using `USERPROFILE` instead.

However, starting with Windows Vista, for secondary logons and services,
the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows'
system directory (usually `C:\Windows\system32`).

That is undesirable, and that location is usually write-protected anyway.

So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to
Windows' system directory before using it, falling back to `USERPROFILE`
if it does.

This fixes git-for-windows#2709

Initial-Path-by: Ivan Pozdeev <vano@mail.mipt.ru>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
headless-git is a git executable without opening a console window. It is
useful when other GUI executables want to call git. We should install it
together with git on Windows.

Signed-off-by: Yuyi Wang <Strawberry_Str@hotmail.com>
winuser.h contains the definition of RT_MANIFEST that our LLVM based
toolchain needs to understand that we want to embed
compat/win32/git.manifest as an application manifest. It currently just
embeds it as additional data that Windows doesn't understand.

This also helps our GCC based toolchain understand that we only want one
copy embedded. It currently embeds one working assembly manifest and one
nearly identical, but useless copy as additional data.

This also teaches our Visual Studio based buildsystems to pick up the
manifest file from git.rc. This means we don't have to explicitly specify
it in contrib/buildsystems/Generators/Vcxproj.pm anymore. Slightly
counter-intuitively this also means we have to explicitly tell Cmake
not to embed a default manifest.

This fixes git-for-windows#4707

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This will help with Git for Windows' maintenance going forward: It
allows Git for Windows to switch its primary libcurl to a variant
without the OpenSSL backend, while still loading an alternate when
setting `http.sslBackend = openssl`.

This is necessary to avoid maintenance headaches with upgrading OpenSSL:
its major version name is encoded in the shared library's file name and
hence major version updates (temporarily) break libraries that are
linked against the OpenSSL library.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In Git for Windows v2.39.0, we fixed a regression where `git.exe` would
no longer work in Windows Nano Server (frequently used in Docker
containers).

This GitHub workflow can be used to verify manually that the Git/Scalar
executables work in Nano Server.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When running Git for Windows on a remote APFS filesystem, it would
appear that the `mingw_open_append()`/`write()` combination would fail
almost exactly like on some CIFS-mounted shares as had been reported in
git-for-windows#2753, albeit with a
different `errno` value.

Let's handle that `errno` value just the same, by suggesting to set
`windows.appendAtomically=false`.

Signed-off-by: David Lomas <dl3@pale-eds.co.uk>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows 10 version 1511 (also known as Anniversary Update), according to
https://learn.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences
introduced native support for ANSI sequence processing. This allows
using colors from the entire 24-bit color range.

All we need to do is test whether the console's "virtual processing
support" can be enabled. If it can, we do not even need to start the
`console_thread` to handle ANSI sequences.

Or, almost all we need to do: When `console_thread()` does its work, it
uses the Unicode-aware `write_console()` function to write to the Win32
Console, which supports Git for Windows' implicit convention that all
text that is written is encoded in UTF-8. The same is not necessarily
true if native ANSI sequence processing is used, as the output is then
subject to the current code page. Let's ensure that the code page is set
to `CP_UTF8` as long as Git writes to it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
By default, the buffer type of Windows' `stdout` is unbuffered (_IONBF),
and there is no need to manually fflush `stdout`.

But some programs, such as the Windows Filtering Platform driver
provided by the security software, may change the buffer type of
`stdout` to full buffering. This nees `fflush(stdout)` to be called
manually, otherwise there will be no output to `stdout`.

Signed-off-by: MinarKotonoha <chengzhuo5@qq.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A long time ago, we decided to run tests in Git for Windows' SDK with
the default `winsymlinks` mode: copying instead of linking. This is
still the default mode of MSYS2 to this day.

However, this is not how most users run Git for Windows: As the majority
of Git for Windows' users seem to be on Windows 10 and newer, likely
having enabled Developer Mode (which allows creating symbolic links
without administrator privileges), they will run with symlink support
enabled.

This is the reason why it is crucial to get the fixes for CVE-2024-? to
the users, and also why it is crucial to ensure that the test suite
exercises the related test cases. This commit ensures the latter.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In order to be a better Windows citizenship, Git should
save its configuration files on AppData folder. This can
enables git configuration files be replicated between machines
using the same Microsoft account logon which would reduce the
friction of setting up Git on new systems. Therefore, if
%APPDATA%\Git\config exists, we use it; otherwise
$HOME/.config/git/config is used.

Signed-off-by: Ariel Lourenco <ariellourenco@users.noreply.github.com>
The sparse tree walk algorithm was created in d5d2e93 (revision:
implement sparse algorithm, 2019-01-16) and involves using the
mark_trees_uninteresting_sparse() method. This method takes a repository
and an oidset of tree IDs, some of which have the UNINTERESTING flag and
some of which do not.

Create a method that has an equivalent set of preconditions but uses a
"dense" walk (recursively visits all reachable trees, as long as they
have not previously been marked UNINTERESTING). This is an important
difference from mark_tree_uninteresting(), which short-circuits if the
given tree has the UNINTERESTING flag.

A use of this method will be added in a later change, with a condition
set whether the sparse or dense approach should be used.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
While this command is definitely something we _want_, chances are that
upstreaming this will require substantial changes.

We still want to be able to experiment with this before that, to focus
on what we need out of this command: To assist with diagnosing issues
with large repositories, as well as to help monitoring the growth and
the associated painpoints of such repositories.

To that end, we are about to integrate this command into
`microsoft/git`, to get the tool into the hands of users who need it
most, with the idea to iterate in close collaboration between these
users and the developers familar with Git's internals.

However, we will definitely want to avoid letting anybody have the
impression that this command, its exact inner workings, as well as its
output format, are anywhere close to stable. To make that fact utterly
clear (and thereby protect the freedom to iterate and innovate freely
before upstreaming the command), let's mark its output as experimental
in all-caps, as the first thing we do.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The winsock2 library provides functions that work on different data
types than file descriptors, therefore we wrap them.

But that is not the only difference: they also do not set `errno` but
expect the callers to enquire about errors via `WSAGetLastError()`.

Let's translate that into appropriate `errno` values whenever the socket
operations fail so that Git's code base does not have to change its
expectations.

This closes git-for-windows#2404

Helped-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We map WSAGetLastError() errors to errno errors in winsock_error_to_errno(),
but the MSVC strerror() implementation only produces "Unknown error" for
most of them. Produce some more meaningful error messages in these
cases.

Our builds for ARM64 link against the newer UCRT strerror() that does know
these errors, so we won't change the strerror() used there.

The wording of the messages is copied from glibc strerror() messages.

Reported-by: M Hickford <mirth.hickford@gmail.com>
Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Although NTLM authentication is considered weak (extending even to
NTLMv2, which purportedly allows brute-forcing reasonably complex
8-character passwords in a matter of days, given ample compute
resources), it _is_ one of the authentication methods supported by
libcurl.

Note: The added test case *cannot* reuse the existing `custom_auth`
facility. The reason is that that facility is backed by an NPH script
("No Parse Headers"), which does not allow handling the 3-phase NTLM
authentication correctly (in my hands, the NPH script would not even be
called upon the Type 3 message, a "200 OK" would be returned, but no
headers, let alone the `git http-backend` output as payload). Having a
separate NTLM authentication script makes the exact workings clearer and
more readable, anyway.

Co-authored-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This will come in handy in the next commit.

Signed-off-by: JiSeop Moon <zcube@zcube.kr>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Bert Belder <bertbelder@gmail.com>
`git survey` exposes its `--top` default via `survey.top` so that a
site or per-repository operator can switch the detail tables on once
and have every subsequent invocation include them. Mirror that
ergonomics for `git repo structure` so that, as `git survey`'s
functionality is folded into `git repo structure`, the configuration
side of the migration story stays equivalent.

Add a small `git_config_int` callback bound to `repo.structure.top`
and invoke it before `parse_options()`, so a `--top=<N>` on the
command line cleanly overrides the configured default (including
`--top=0` to opt out of the detail tables when configuration enables
them). Reject negative configured values with the same wording as the
command-line guard, since `git_config_int()` happily returns negative
integers.

Document the new variable in a fresh `Documentation/config/repo.adoc`
and wire it into the alphabetical includes in `Documentation/config.adoc`
between `repack.adoc` and `rerere.adoc`. Cover the precedence
behaviour with a t1901 test: a configured value enables the tables by
default, and a command-line `--top=0` suppresses them again.

Note that the reported paths respect the `core.quotePath` setting.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This comment has been true for the longest time; The combination of the
two preceding commits made it incorrect, so let's drop that comment.

Signed-off-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NTLM authentication is relatively weak. This is the case even with the
default setting of modern Windows versions, where NTLMv1 and LanManager
are disabled and only NTLMv2 is enabled: NTLMv2 hashes of even
reasonably complex 8-character passwords can be broken in a matter of
days, given enough compute resources.

Even worse: On Windows, NTLM authentication uses Security Support
Provider Interface ("SSPI"), which provides the credentials without
requiring the user to type them in.

Which means that an attacker could talk an unsuspecting user into
cloning from a server that is under the attacker's control and extracts
the user's NTLMv2 hash without their knowledge.

For that reason, let's disallow NTLM authentication by default.

NTLM authentication is quite simple to set up, though, and therefore
there are still some on-prem Azure DevOps setups out there whose users
and/or automation rely on this type of authentication. To give them an
escape hatch, introduce the `http.<url>.allowNTLMAuth` config setting
that can be set to `true` to opt back into using NTLM for a specific
remote repository.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `git_terminal_prompt()` function expects the terminal window to be
attached to a Win32 Console. However, this is not the case with terminal
windows other than `cmd.exe`'s, e.g. with MSys2's own `mintty`.

Non-cmd terminals such as `mintty` still have to have a Win32 Console
to be proper console programs, but have to hide the Win32 Console to
be able to provide more flexibility (such as being resizeable not only
vertically but also horizontally). By writing to that Win32 Console,
`git_terminal_prompt()` manages only to send the prompt to nowhere and
to wait for input from a Console to which the user has no access.

This commit introduces a function specifically to support `mintty` -- or
other terminals that are compatible with MSys2's `/dev/tty` emulation. We
use the `TERM` environment variable as an indicator for that: if the value
starts with "xterm" (such as `mintty`'s "xterm_256color"), we prefer to
let `xterm_prompt()` handle the user interaction.

The most prominent user of `git_terminal_prompt()` is certainly
`git-remote-https.exe`. It is an interesting use case because both
`stdin` and `stdout` are redirected when Git calls said executable, yet
it still wants to access the terminal.

When running inside a `mintty`, the terminal is not accessible to the
`git-remote-https.exe` program, though, because it is a MinGW program
and the `mintty` terminal is not backed by a Win32 console.

To solve that problem, we simply call out to the shell -- which is an
*MSys2* program and can therefore access `/dev/tty`.

Helped-by: nalla <nalla@hamal.uberspace.de>
Signed-off-by: Karsten Blees <blees@dcon.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is a known issue that a rename() can fail with an "Access denied"
error at times, when copying followed by deleting the original file
works. Let's just fall back to that behavior.

Signed-off-by: JiSeop Moon <zcube@zcube.kr>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, symbolic links actually have a type depending on the target:
it can be a file or a directory.

In certain circumstances, this poses problems, e.g. when a symbolic link
is supposed to point into a submodule that is not checked out, so there
is no way for Git to auto-detect the type.

To help with that, we will add support over the course of the next
commits to specify that symlink type via the Git attributes. This
requires an index_state, though, something that Git for Windows'
`symlink()` replacement cannot know about because the function signature
is defined by the POSIX standard and not ours to change.

So let's introduce a helper function to create symbolic links that
*does* know about the index_state.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue the size_t evacuation around large object handling: with
deflate_it() and the locals around it widened, the
cast_size_t_to_ulong() shim the prior delta_delta() widening had to
leave behind in emit_binary_diff_body() goes away. deflate_it() is
file-static; the only callers are the two in emit_binary_diff_body()
already touched here.

emit_diff_symbol() formats the resulting sizes via uintmax_t / %"PRIuMAX",
so the diff output is not affected; only the per-process upper bound
on a binary patch chunk that this function can address grows beyond
4 GiB on Windows.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
`git survey` started life as an experimental scale-measurement tool;
the preceding commits give `git repo structure` the path-level detail
tables and ref-scoping mechanism that were `git survey`'s main draw,
so the two now overlap substantially. Plan the migration explicitly:
add a short notice at the top of the description making clear which
of `git survey`'s knobs map to which `git repo structure` option, and
state that a future release will turn `git survey` into a thin shim
over `git repo structure`.

Putting the notice in the description (rather than only the synopsis)
ensures it shows up in `git help survey` rendering before the reader
sees any option specifics, so an operator skimming the page learns
about the replacement before adopting any survey-specific flags.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho and others added 22 commits September 22, 2026 21:01
When trying to ensure that long paths are handled correctly, we
first normalize absolute paths as we encounter them.

However, if the path is a so-called "drive-less" absolute path, i.e. if
it is relative to the current drive but _does_ start with a directory
separator, we would want the normalized path to be such a drive-less
absolute path, too.

Let's do that, being careful to still include the drive prefix when we
need to go through the `\\?\` dance (because there, the drive prefix is
absolutely required).

This fixes git-for-windows#4586.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When t5605 tries to verify that files are hardlinked (or that they are
not), it uses the `-links` option of the `find` utility.

BusyBox' implementation does not support that option, and BusyBox-w32's
lstat() does not even report the number of hard links correctly (for
performance reasons).

So let's just switch to a different method that actually works on
Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git for Windows accepts pull requests; Core Git does not. Therefore we
need to adjust the template (because it only matches core Git's
project management style, not ours).

Also: direct Git for Windows enhancements to their contributions page,
space out the text for easy reading, and clarify that the mailing list
is plain text, not HTML.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Update wchar_t buffers to use MAX_LONG_PATH instead of MAX_PATH and call
xutftowcs_long_path() in the Win32 backend source files.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Git for Windows uses MSYS2's Bash to run the test suite, which comes
with benefits but also at a heavy price: on the plus side, MSYS2's
POSIX emulation layer allows us to continue pretending that we are on a
Unix system, e.g. use Unix paths instead of Windows ones, yet this is
bought at a rather noticeable performance penalty.

There *are* some more native ports of Unix shells out there, though,
most notably BusyBox-w32's ash. These native ports do not use any POSIX
emulation layer (or at most a *very* thin one, choosing to avoid
features such as fork() that are expensive to emulate on Windows), and
they use native Windows paths (usually with forward slashes instead of
backslashes, which is perfectly legal in almost all use cases).

And here comes the problem: with a $PWD looking like, say,
C:/git-sdk-64/usr/src/git/t/trash directory.t5813-proto-disable-ssh
Git's test scripts get quite a bit confused, as their assumptions have
been shattered. Not only does this path contain a colon (oh no!), it
also does not start with a slash.

This is a problem e.g. when constructing a URL as t5813 does it:
ssh://remote$PWD. Not only is it impossible to separate the "host" from
the path with a $PWD as above, even prefixing $PWD by a slash won't
work, as /C:/git-sdk-64/... is not a valid path.

As a workaround, detect when $PWD does not start with a slash on
Windows, and simply strip the drive prefix, using an obscure feature of
Windows paths: if an absolute Windows path starts with a slash, it is
implicitly prefixed by the drive prefix of the current directory. As we
are talking about the current directory here, anyway, that strategy
works.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Rather than using private IFTTT Applets that send mails to this
maintainer whenever a new version of a Git for Windows component was
released, let's use the power of GitHub workflows to make this process
publicly visible.

This workflow monitors the Atom/RSS feeds, and opens a ticket whenever a
new version was released.

Note: Bash sometimes releases multiple patched versions within a few
minutes of each other (i.e. 5.1p1 through 5.1p4, 5.0p15 and 5.0p16). The
MSYS2 runtime also has a similar system. We can address those patches as
a group, so we shouldn't get multiple issues about them.

Note further: We're not acting on newlib releases, OpenSSL alphas, Perl
release candidates or non-stable Perl releases. There's no need to open
issues about them.

Co-authored-by: Matthias Aßhauer <mha1993@live.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is the recommended way on GitHub to describe policies revolving around
security issues and about supported versions.

Helped-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, git repositories may have extra files which need cleaned
(e.g., a build directory) that may be arbitrarily deep. Suggest using
`core.longPaths` if such situations are encountered.

Fixes: git-for-windows#2715
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
These are Git for Windows' Git GUI and gitk patches. We will have to
decide at some point what to do about them, but that's a little lower
priority (as Git GUI seems to be unmaintained for the time being, and
the gitk maintainer keeps a very low profile on the Git mailing list,
too).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, the current working directory is pretty much guaranteed to
contain a colon. If we feed that path to CVS, it mistakes it for a
separator between host and port, though.

This has not been a problem so far because Git for Windows uses MSYS2's
Bash using a POSIX emulation layer that also pretends that the current
directory is a Unix path (at least as long as we're in a shell script).

However, that is rather limiting, as Git for Windows also explores other
ports of other Unix shells. One of those is BusyBox-w32's ash, which is
a native port (i.e. *not* using any POSIX emulation layer, and certainly
not emulating Unix paths).

So let's just detect if there is a colon in $PWD and punt in that case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ITOR"

In e3f7e01 (Revert "editor: save and reset terminal after calling
EDITOR", 2021-11-22), we reverted the commit wholesale where the
terminal state would be saved and restored before/after calling an
editor.

The reverted commit was intended to fix a problem with Windows Terminal
where simply calling `vi` would cause problems afterwards.

To fix the problem addressed by the revert, but _still_ keep the problem
with Windows Terminal fixed, let's revert the revert, with a twist: we
restrict the save/restore _specifically_ to the case where `vi` (or
`vim`) is called, and do not do the same for any other editor.

This should still catch the majority of the cases, and will bridge the
time until the original patch is re-done in a way that addresses all
concerns.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `--stdin` option was a well-established paradigm in other commands,
therefore we implemented it in `git reset` for use by Visual Studio.

Unfortunately, upstream Git decided that it is time to introduce
`--pathspec-from-file` instead.

To keep backwards-compatibility for some grace period, we therefore
reinstate the `--stdin` option on top of the `--pathspec-from-file`
option, but mark it firmly as deprecated.

Helped-by: Victoria Dye <vdye@github.com>
Helped-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reintroduce the 'core.useBuiltinFSMonitor' config setting (originally added
in 0a756b2 (fsmonitor: config settings are repository-specific,
2021-03-05)) after its removal from the upstream version of FSMonitor.

Upstream, the 'core.useBuiltinFSMonitor' setting was rendered obsolete by
"overloading" the 'core.fsmonitor' setting to take a boolean value. However,
several applications (e.g., 'scalar') utilize the original config setting,
so it should be preserved for a deprecation period before complete removal:

* if 'core.fsmonitor' is a boolean, the user is correctly using the new
  config syntax; do not use 'core.useBuiltinFSMonitor'.
* if 'core.fsmonitor' is unspecified, use 'core.useBuiltinFSMonitor'.
* if 'core.fsmonitor' is a path, override and use the builtin FSMonitor if
  'core.useBuiltinFSMonitor' is 'true'; otherwise, use the FSMonitor hook
  indicated by the path.

Additionally, for this deprecation period, advise users to switch to using
'core.fsmonitor' to specify their use of the builtin FSMonitor.

Signed-off-by: Victoria Dye <vdye@github.com>
Upstream Git does not test their tags with the expensive set of tests,
so a couple of them seem quite broken for now, even so much as hanging
indefinitely.

It is outside of the responsibility of the Git for Windows project to
fix upstream's own tests for platforms other than Windows, so let's not
exercise them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
A fix for calling `vim` in Windows Terminal caused a regression and was
reverted. We partially un-revert this, to get the fix again.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This topic branch re-adds the deprecated --stdin/-z options to `git
reset`. Those patches were overridden by a different set of options in
the upstream Git project before we could propose `--stdin`.

We offered this in MinGit to applications that wanted a safer way to
pass lots of pathspecs to Git, and these applications will need to be
adjusted.

Instead of `--stdin`, `--pathspec-from-file=-` should be used, and
instead of `-z`, `--pathspec-file-nul`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally introduced as `core.useBuiltinFSMonitor` in Git for Windows
and developed, improved and stabilized there, the built-in FSMonitor
only made it into upstream Git (after unnecessarily long hemming and
hawing and throwing overly perfectionist style review sticks into the
spokes) as `core.fsmonitor = true`.

In Git for Windows, with this topic branch, we re-introduce the
now-obsolete config setting, with warnings suggesting to existing users
how to switch to the new config setting, with the intention to
ultimately drop the patch at some stage.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…updates

Start monitoring updates of Git for Windows' component in the open
Add a README.md for GitHub goodness.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho linked an issue Sep 22, 2026 that may be closed by this pull request
@dscho

dscho commented Sep 22, 2026

Copy link
Copy Markdown
Member Author

/git-artifacts

The tag-git workflow run was started

@gitforwindowshelper

This comment was marked as outdated.

@gitforwindowshelper

Copy link
Copy Markdown

Validate the installer manually

The installer was built successfully;
Please download, install, and run through the pre-flight check-list.
@dscho ☝️

@dscho

dscho commented Sep 22, 2026

Copy link
Copy Markdown
Member Author

/release

The release-git workflow run was started

@gitforwindowshelper

Copy link
Copy Markdown

@dscho, please Share on Bluesky and send the announcement email.

@dscho
dscho merged commit 6f71233 into git-for-windows:main Sep 22, 2026
85 of 86 checks passed
@dscho
dscho deleted the rebase-to-v2.56.0-rc2 branch September 22, 2026 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[New git version] v2.56.0-rc2