Skip to content

Merge 'readme' into HEAD

7e509c4
Select commit
Loading
Failed to load commit list.
Merged

Rebase to v2.54.0-rc1 #6166

Merge 'readme' into HEAD
7e509c4
Select commit
Loading
Failed to load commit list.
GitForWindowsHelper / shears-seen succeeded Apr 10, 2026 in 0s

shears/seen rebased successfully

Rebase Summary: seen

From: 8e28316db8 (Merge 'readme' into HEAD, 2018-06-07) (a264df0fdd..8e28316db8)

Resolved: e9ab12b (compat/mingw: handle WSA errors in strerror, 2024-12-22)

kept both u-mingw (patch) and u-odb-inmemory (upstream) in alphabetical order in Makefile and t/meson.build

Range-diff
  • 1: e9ab12b ! 1: 0b300e5 compat/mingw: handle WSA errors in strerror

    @@ Makefile: CLAR_TEST_SUITES += u-hash
      CLAR_TEST_SUITES += u-list-objects-filter-options
      CLAR_TEST_SUITES += u-mem-pool
     +CLAR_TEST_SUITES += u-mingw
    + CLAR_TEST_SUITES += u-odb-inmemory
      CLAR_TEST_SUITES += u-oid-array
      CLAR_TEST_SUITES += u-oidmap
    - CLAR_TEST_SUITES += u-oidtree
     
      ## compat/mingw-posix.h ##
     @@ compat/mingw-posix.h: int mingw_socket(int domain, int type, int protocol);
    @@ t/meson.build: clar_test_suites = [
        'unit-tests/u-list-objects-filter-options.c',
        'unit-tests/u-mem-pool.c',
     +  'unit-tests/u-mingw.c',
    +   'unit-tests/u-odb-inmemory.c',
        'unit-tests/u-oid-array.c',
        'unit-tests/u-oidmap.c',
    -   'unit-tests/u-oidtree.c',
     
      ## t/unit-tests/u-mingw.c (new) ##
     @@

To: c85df10c85 (Merge 'readme' into HEAD, 2018-06-07) (15d35d058c..c85df10c85)

Statistics

Metric Count
Total conflicts 1
Skipped (upstreamed) 0
Resolved surgically 1
Range-diff (click to expand)
  • 1: 6bad2e1 = 1: c9bd6b9 unix-socket: avoid leak when initialization fails

  • 2: f5b47d9 = 2: 0155ad3 grep: prevent ^$ false match at end of file

  • 3: 449904e = 3: e32e5de Merge branch 'fixes-from-the-git-mailing-list'

  • 14: 5acbca9 = 4: eee5d83 vcpkg_install: detect lack of Git

  • 15: 6c2e4e1 = 5: 66c8b3e vcpkg_install: add comment regarding slow network connections

  • 16: 24b3e8c = 6: bf9bf98 vcbuild: install ARM64 dependencies when building ARM64 binaries

  • 17: b17723f = 7: 0c4df9e vcbuild: add an option to install individual 'features'

  • 18: 84ef981 = 8: 1793bd7 cmake: allow building for Windows/ARM64

  • 5: 2873595 = 9: 60f5662 mingw: include the Python parts in the build

  • 19: 239f6bb = 10: 0f12544 ci(vs-build) also build Windows/ARM64 artifacts

  • 7: b9027a6 = 11: 416b855 win32/pthread: avoid name clashes with winpthread

  • 20: 74c5f94 = 12: da22dd7 Add schannel to curl installation

  • 21: 2bc3acd = 13: 364d153 hash-object: demonstrate a >4GB/LLP64 problem

  • 10: 4e18d98 = 14: ce646b0 git-compat-util: avoid redeclaring _DEFAULT_SOURCE

  • 23: 279ad5a = 15: 31c9dfb cmake(): allow setting HOST_CPU for cross-compilation

  • 24: 5dcf5be = 16: db9f48a object-file.c: use size_t for header lengths

  • 22: 8904d40 = 17: cc47527 Import the source code of mimalloc v2.2.7

  • 4: 5d85de6 = 18: e4f6223 t9350: point out that refs are not updated correctly

  • 26: 0c449b9 = 19: 525613c CMake: default Visual Studio generator has changed

  • 27: caefec5 = 20: 3dad964 hash algorithms: use size_t for section lengths

  • 25: 3a1b5d0 = 21: 5314e1c mimalloc: adjust for building inside Git

  • 6: 8982f12 = 22: dea39ff transport-helper: add trailing --

  • 29: 8cd5fe6 = 23: 745c637 mingw: demonstrate a git add issue with NTFS junctions

  • 30: 41164e0 = 24: b914dc7 .gitignore: add Visual Studio CMakeSetting.json file

  • 31: ba71df9 = 25: 8353a24 hash-object --stdin: verify that it works with >4GB/LLP64

  • 28: f60b365 = 26: 481c06e mimalloc: offer a build-time option to enable it

  • 33: 6bee3ec = 27: 400ccbc t5505/t5516: allow running without .git/branches/ in the templates

  • 8: 68dd746 = 28: 997d6da remote-helper: check helper status after import/export

  • 9: 046f101 = 29: e325613 clean: do not traverse mount points

  • 34: b4936ac = 30: ef06566 strbuf_realpath(): use platform-dependent API if available

  • 35: 92afeca = 31: ca543de http: use new "best effort" strategy for Secure Channel revoke checking

  • 36: 0a1f605 = 32: 429668a subtree: update contrib/subtree test target

  • 37: 8827ecf = 33: 9e7ea2d CMakeLists: add default "x64-windows" arch for Visual Studio

  • 38: e67d677 = 34: 932ebc7 hash-object: add another >4GB/LLP64 test case

  • 32: dcfce31 = 35: 814df64 mingw: use mimalloc

  • 42: 74343c0 = 36: 0973dff t5505/t5516: fix white-space around redirectors

  • 11: 91ab10f = 37: 5c8ed2a Always auto-gc after calling a fast-import transport

  • 12: b19e0e9 = 38: 6c997d6 mingw: prevent regressions with "drive-less" absolute paths

  • 13: f7a69a7 = 39: dd8285f clean: remove mount points when possible

  • 44: 53c7f15 = 40: cc4e1a2 transport: optionally disable side-band-64k

  • 45: f4cef12 = 41: 5cc7eda mingw: fix fatal error working on mapped network drives on Windows

  • 46: ed3154c = 42: b9d4e3f clink.pl: fix MSVC compile script to handle libcurl-d.lib

  • 47: 4ab688f = 43: d7e820f mingw: implement a platform-specific strbuf_realpath()

  • 48: c3cfc06 = 44: 875e5e7 t3701: verify that we can add lots of files interactively

  • 49: eca72a6 = 45: 4e2bc60 commit: accept "scissors" with CR/LF line endings

  • 50: 3d68ef4 = 46: 0443b58 t0014: fix indentation

  • 51: 0da842b = 47: 2b58e3e git-gui: accommodate for intent-to-add files

  • 52: 6351c57 = 48: f8b9a94 mingw: allow for longer paths in parse_interpreter()

  • 53: fa4d574 = 49: 0c7aba2 compat/vcbuild: document preferred way to build in Visual Studio

  • 54: 3f03a57 = 50: 80914ae http: optionally send SSL client certificate

  • 55: 8305770 = 51: da988a0 ci: run contrib/subtree tests in CI builds

  • 56: 24ddd1b = 52: 0ed1342 CMake: show Win32 and Generator_platform build-option values

  • 57: 04da3fe = 53: 2a08d03 hash-object: add a >4GB/LLP64 test case using filtered input

  • 41: e4ad457 = 54: 64873ae windows: skip linking git-<command> for built-ins

  • 64: a404d6a = 55: e0ce486 mingw: stop hard-coding CC = gcc

  • 65: e65b9af = 56: 8f2deb7 mingw: drop the -D_USE_32BIT_TIME_T option

  • 66: 2046563 = 57: 32ba881 mingw: only use -Wl,--large-address-aware for 32-bit builds

  • 67: 3fb3266 = 58: 7229823 mingw: avoid over-specifying --pic-executable

  • 68: b069ed6 = 59: de44f77 mingw: set the prefix and HOST_CPU as per MSYS2's settings

  • 69: 890d5f5 = 60: 481d773 mingw: only enable the MSYS2-specific stuff when compiling in MSYS2

  • 70: 3a58ef0 = 61: d3a86d5 mingw: rely on MSYS2's metadata instead of hard-coding it

  • 71: 088c0eb = 62: ae29975 mingw: always define ETC_* for MSYS2 environments

  • 72: e4c087d = 63: 737e32c max_tree_depth: lower it for clang builds in general on Windows

  • 73: bc1b2ed = 64: 0a82c2d mingw: ensure valid CTYPE

  • 74: 0620ac0 = 65: 4871fc0 ci: work around a problem with HTTP/2 vs libcurl v8.10.0

  • 75: 089c2cf = 66: bfb1076 mingw: allow git.exe to be used instead of the "Git wrapper"

  • 76: 8c5d707 = 67: 90cfaca revision: create mark_trees_uninteresting_dense()

  • 77: af439e5 = 68: ab0af3e mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

  • 78: a47945b = 69: 1aaeccf survey: stub in new experimental 'git-survey' command

  • 79: 9016027 = 70: d1c148a Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'

  • 80: 65a6f58 = 71: 086c4ea survey: add command line opts to select references

  • 81: 5b094bd = 72: 06fbdb2 clink.pl: fix libexpatd.lib link error when using MSVC

  • 82: 33e2cf0 = 73: d43fd5c survey: start pretty printing data in table form

  • 83: 2aae740 = 74: ff1f874 Makefile: clean up .ilk files when MSVC=1

  • 84: 701b9e5 = 75: 11d799c survey: add object count summary

  • 85: 2629ad4 = 76: 89c666b vcbuild: add support for compiling Windows resource files

  • 86: 5f080b3 = 77: 52f2aac survey: summarize total sizes by object type

  • 87: a315ed1 = 78: 7ad1c17 config.mak.uname: add git.rc to MSVC builds

  • 43: 3d7fd8c = 79: a1bfcf7 MinGW: link as terminal server aware

  • 88: 97fa5f7 = 80: 1be34af survey: show progress during object walk

  • 90: 0dbef46 = 81: 90637d0 clink.pl: ignore no-stack-protector arg on MSVC=1 builds

  • 91: b15b3af = 82: 6df40a6 http: optionally load libcurl lazily

  • 92: a0fe012 = 83: a7b4b1b survey: add ability to track prioritized lists

  • 95: 5f7948b = 84: ccba8ac clink.pl: move default linker options for MSVC=1 builds

  • 96: 0eb586e = 85: ab45519 http: support lazy-loading libcurl also on Windows

  • 97: 8eaf6ca = 86: c8e9240 survey: add report of "largest" paths

  • 39: 0092f95 = 87: 99d55a6 setup: properly use "%(prefix)/" when in WSL

  • 40: be6cc54 = 88: 95fae28 Add config option windows.appendAtomically

  • 100: 47cf682 = 89: dd78b37 cmake: install headless-git.

  • 101: 45e4070 = 90: bba0c07 http: when loading libcurl lazily, allow for multiple SSL backends

  • 102: a568cb2 = 91: 46ac803 survey: add --top= option and config

  • 58: e3b8bae = 92: da5a912 compat/mingw.c: do not warn when failing to get owner

  • 59: febc71e = 93: 67d3eb3 mingw: $env:TERM="xterm-256color" for newer OSes

  • 60: c7a3963 = 94: cbb5f4c winansi: check result and Buffer before using Name

  • 61: c213046 = 95: 57bff58 mingw: change core.fsyncObjectFiles = 1 by default

  • 62: b146509 = 96: 3edbdac Fix Windows version resources

  • 63: d3f9de0 = 97: f53aaef status: fix for old-style submodules with commondir

  • 105: d13777b = 98: b272306 git.rc: include winuser.h

  • 106: 91a9af1 = 99: 9c27120 mingw: do load libcurl dynamically by default

  • 107: 1b18e26 = 100: f9f54c2 Add a GitHub workflow to verify that Git/Scalar work in Nano Server

  • 108: a27dd5e = 101: 41d7ba6 mingw: suggest windows.appendAtomically in more cases

  • 109: afa732c = 102: df7f642 win32: use native ANSI sequence processing, if possible

  • 110: 126d6dc = 103: 493241f common-main.c: fflush stdout buffer upon exit

  • 111: 0963b3d = 104: b6d3674 t5601/t7406(mingw): do run tests with symlink support

  • 112: b6967af = 105: 0d362a2 win32: ensure that localtime_r() is declared even in i686 builds

  • 113: 028c564 = 106: 7fe112c Fallback to AppData if XDG_CONFIG_HOME is unset

  • 114: 759c0fc = 107: 21bb070 run-command: be helpful with Git LFS fails on Windows 7

  • 89: 4ae9535 = 108: f0c8127 mingw: make sure errno is set correctly when socket operations fail

  • 115: 5c4eacf = 109: a0d35c9 survey: clearly note the experimental nature in the output

  • 121: ba49be0 = 110: 1ee6582 Merge 'remote-hg-prerequisites' into HEAD

  • 122: 5ab69c1 = 111: 66d1e77 Merge branch 'drive-prefix'

  • 123: fab2b12 = 112: a9a85b7 Merge branch 'dont-clean-junctions'

  • 93: e9ab12b ! 113: 0b300e5 compat/mingw: handle WSA errors in strerror

    @@ Makefile: CLAR_TEST_SUITES += u-hash
      CLAR_TEST_SUITES += u-list-objects-filter-options
      CLAR_TEST_SUITES += u-mem-pool
     +CLAR_TEST_SUITES += u-mingw
    + CLAR_TEST_SUITES += u-odb-inmemory
      CLAR_TEST_SUITES += u-oid-array
      CLAR_TEST_SUITES += u-oidmap
    - CLAR_TEST_SUITES += u-oidtree
     
      ## compat/mingw-posix.h ##
     @@ compat/mingw-posix.h: int mingw_socket(int domain, int type, int protocol);
    @@ t/meson.build: clar_test_suites = [
        'unit-tests/u-list-objects-filter-options.c',
        'unit-tests/u-mem-pool.c',
     +  'unit-tests/u-mingw.c',
    +   'unit-tests/u-odb-inmemory.c',
        'unit-tests/u-oid-array.c',
        'unit-tests/u-oidmap.c',
    -   'unit-tests/u-oidtree.c',
     
      ## t/unit-tests/u-mingw.c (new) ##
     @@
  • 94: 513dea7 = 114: 092458d t5563: verify that NTLM authentication works

  • 124: 0915ccc = 115: ac741ae Merge branch 'msys2-python'

  • 98: ec7aa74 = 116: b40575f compat/mingw: drop outdated comment

  • 99: e793380 = 117: 4931c10 http: disallow NTLM authentication by default

  • 125: 0bc9e53 = 118: 4cf9be0 Update mimalloc to v2.2.7 (#6048)

  • 103: 111079e = 119: 0bc4960 t0301: actually test credential-cache on Windows

  • 104: 08efe32 = 120: 30266d7 http: warn if might have failed because of NTLM

  • 126: 281b9f8 = 121: dfa9445 Merge pull request #2375 from assarbad/reintroduce-sideband-config

  • 116: f99f874 = 122: c4780f0 credential-cache: handle ECONNREFUSED gracefully

  • 117: 62f0edd = 123: 17641b4 reftable: do make sure to use custom allocators

  • 118: 774e7c6 = 124: f663a76 check-whitespace: avoid alerts about upstream commits

  • 119: 86aef58 = 125: f87501c t/t5571-prep-push-hook.sh: Add test with writing to stderr

  • 120: 480c707 = 126: 5c7a0be credential: advertise NTLM suppression and allow helpers to re-enable

  • 155: 68cf2c2 = 127: f73ff61 dir: do not traverse mount points

  • 156: 27dc673 = 128: d047b74 win32: thread-utils: handle multi-socket systems

  • 127: 08a2ff5 = 129: 8357480 Merge pull request #2488 from bmueller84/master

  • 128: 94d54ff = 130: 70825c0 Merge pull request #2501 from jeffhostetler/clink-debug-curl

  • 129: bae3d48 = 131: 1505b69 Merge pull request #2504 from dscho/access-repo-via-junction

  • 130: 9cae1bb = 132: 6811a3a Merge pull request #2535 from dscho/schannel-revoke-best-effort

  • 131: 0ed8393 = 133: 3d727f0 Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master

  • 132: fa98eee = 134: c4e9b3c Merge 'add-p-many-files'

  • 133: f09988c = 135: ba7fd02 Merge pull request #2714 from lbonanomi/crlf-scissors

  • 134: 671aab2 = 136: 2922f0b Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info

  • 135: 8c956fd = 137: 3660ce2 Merge 'git-gui/js/intent-to-add'

  • 136: 916afde = 138: 863edb4 Merge pull request #2351 from PhilipOakley/vcpkg-tip

  • 137: 5bdf58e = 139: bc76ea3 Merge pull request #2915 from dennisameling/windows-arm64-support

  • 138: 4d80893 = 140: 1fe2e30 Merge pull request #3327 from dennisameling/fix-host-cpu

  • 139: 7d2ba07 = 141: 36b99e1 Merge pull request #3165 from dscho/increase-allowed-length-of-interpreter-path

  • 140: 27d5122 = 142: 8555fc5 Merge pull request #3220 from dscho/there-is-no-vs/master-anymore

  • 141: 22e4f5c = 143: be515fd Merge pull request #3293 from pascalmuller/http-support-automatically-sending-client-certificate

  • 142: 23a2dbd = 144: 192fa00 Merge pull request #3349 from vdye/feature/ci-subtree-tests

  • 143: 590d320 = 145: d5d4ccd Merge pull request #3306 from PhilipOakley/vs-sln

  • 144: 2ebf07c = 146: c5f2462 Merge pull request #3533 from PhilipOakley/hashliteral_t

  • 145: 9dd6b52 = 147: 7da5257 Merge pull request #3791: Various fixes around safe.directory

  • 146: d662929 = 148: 75b1a5e Merge pull request #3751 from rkitover/native-term

  • 147: 7a2a65b = 149: 15ee983 Merge pull request #3875 from 1480c1/wine/detect_msys_tty

  • 148: 821ac0d = 150: 87bb525 Merge branch 'optionally-dont-append-atomically-on-windows'

  • 149: 8ea7ed0 = 151: fefdacf Merge branch 'fsync-object-files-always'

  • 150: 6bd0519 = 152: ab4db28 Merge pull request #3942 from rimrul/mingw-tsaware

  • 151: 6315149 = 153: 3c1bd75 Fix Windows version resources (#4092)

  • 152: 007f827 = 154: 7c61f5e Fix global repository field not being cleared (#4083)

  • 153: bd178a7 = 155: 6dbed56 Skip linking the "dashed" git-<command>s for built-ins (#4252)

  • 154: 6044139 = 156: f93acc4 Add full mingw-w64-git (i.e. regular MSYS2 ecosystem) support (#5971)

  • 157: dece2a3 = 157: 0b5a4be Merge pull request #2506 from dscho/issue-2283

  • 158: 0ef1aca = 158: c726e59 Merge pull request #2974 from derrickstolee/maintenance-and-headless

  • 159: f316af3 = 159: aea29a4 ARM64: Embed manifest properly (#4718)

  • 160: a593588 = 160: cefd51c Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (#4410)

  • 161: 15c92c5 = 161: 9b68866 Merge branch 'nano-server'

  • 162: 244914d = 162: 352753f Additional error checks for issuing the windows.appendAtomically warning (#4528)

  • 163: eb5869b = 163: 22300c7 win32: use native ANSI sequence processing, if possible (#4700)

  • 164: 5bbf8e0 = 164: 22b46d3 common-main.c: fflush stdout buffer when exit (#4901)

  • 165: 410460f = 165: 48e6fde Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'

  • 166: 5773e0a = 166: 464f6cf Merge branch 'Fix-i686-build-with-GCC-v14'

  • 167: c66f207 = 167: 4ba086b Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'

  • 168: 8dff78c = 168: c891df0 Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'

  • 169: cac1ec3 = 169: ba3828e pack-objects: create new name-hash algorithm (#5157)

  • 170: 474b9d0 = 170: a2575c3 Add path walk API and its use in 'git pack-objects' (#5171)

  • 171: 67098f9 = 171: 4128e18 Add experimental 'git survey' builtin (#5174)

  • 172: f8619c1 = 172: 50295c6 credential-cache: handle ECONNREFUSED gracefully (#5329)

  • 173: 196df60 = 173: 1b141ee Merge branch 'reftable-vs-custom-allocators'

  • 174: 917595a = 174: a67d309 Merge branch 'check-whitespace-only-downstream'

  • 175: b524b39 = 175: 2a53517 t/t5571-prep-push-hook.sh: Add test with writing to stderr (#6063)

  • 176: 5935518 = 176: c10ea27 Merge branch 'disallow-ntlm-auth-by-default'

  • 177: c3697c4 = 177: 8777519 Don't traverse mount points in remove_dir_recurse() (#6151)

  • 178: 217abe6 = 178: 48cea8b Detect number of cores better on multi-socket systems (#6108)

  • 179: 9594cb0 = 179: 25fa9fa Merge branch 'ready-for-upstream'

  • 180: cfc8c18 = 180: 0173073 ci(macos): skip the git p4 tests

  • 181: db5a8c8 = 181: 1cbcb07 ci(macos): skip the git p4 tests (#5954)

  • 182: fc413f6 = 182: bc49615 Win32: make FILETIME conversion functions public

  • 183: d704ad2 = 183: d511670 Win32: dirent.c: Move opendir down

  • 184: c5f51ea = 184: 8d30229 mingw: make the dirent implementation pluggable

  • 185: 47d08f6 = 185: 642d1d1 Win32: make the lstat implementation pluggable

  • 186: 8a5e987 = 186: f225d26 mingw: add infrastructure for read-only file system level caches

  • 187: 99fad45 = 187: fb9086f mingw: add a cache below mingw's lstat and dirent implementations

  • 188: eed27c7 = 188: 4549258 fscache: load directories only once

  • 190: 2d9b547 = 189: 75a975d fscache: add key for GIT_TRACE_FSCACHE

  • 192: c53be83 = 190: 36e51c8 fscache: remember not-found directories

  • 194: fcac47f = 191: e961010 fscache: add a test for the dir-not-found optimization

  • 195: 30b764a = 192: cd587bc add: use preload-index and fscache for performance

  • 196: 4a02212 = 193: 33737a6 dir.c: make add_excludes aware of fscache during status

  • 197: a116095 = 194: d62bf7d fscache: make fscache_enabled() public

  • 198: 19fb49b = 195: 34447bf dir.c: regression fix for add_excludes with fscache

  • 199: 1e81451 = 196: c551c95 fetch-pack.c: enable fscache for stats under .git/objects

  • 200: 002cbae = 197: 1516855 checkout.c: enable fscache for checkout again

  • 201: 28d464e = 198: dee7f6c Enable the filesystem cache (fscache) in refresh_index().

  • 202: 0fb0a96 = 199: 2f1e0c9 fscache: use FindFirstFileExW to avoid retrieving the short name

  • 189: b295361 = 200: d9686a6 git-gui--askyesno: fix funny text wrapping

  • 203: a2a68ba = 201: 33d5510 fscache: add GIT_TEST_FSCACHE support

  • 191: bcdca0b = 202: 3622427 git-gui--askyesno (mingw): use Git for Windows' icon, if available

  • 204: 2fa38f7 = 203: 79d8596 fscache: add fscache hit statistics

  • 193: aa0242a = 204: c53797b Merge branch 'git-gui-askyesno'

  • 205: 66af964 = 205: 3f46876 unpack-trees: enable fscache for sparse-checkout

  • 206: 9411685 = 206: 27dac7b status: disable and free fscache at the end of the status command

  • 207: c5c1d63 = 207: b3b51a1 mem_pool: add GIT_TRACE_MEMPOOL support

  • 208: bb4f982 = 208: 59ff2a0 fscache: fscache takes an initial size

  • 209: bc9c38e = 209: 7149e30 fscache: update fscache to be thread specific instead of global

  • 210: 2d91b38 = 210: 3f219a0 fscache: teach fscache to use mempool

  • 211: 8adbecc = 211: 7e91ee9 fscache: make fscache_enable() thread safe

  • 212: 7f1c6d4 = 212: 7a1161c fscache: teach fscache to use NtQueryDirectoryFile

  • 213: 9dff5ff = 213: 87b1849 fscache: remember the reparse tag for each entry

  • 214: 195a976 = 214: 0651be1 Merge branch 'fscache'

  • 215: 1ea3221 = 215: db58cbe fscache: implement an FSCache-aware is_mount_point()

  • 216: 1071d4c = 216: f465123 Merge pull request #1909 from benpeart/free-fscache-after-status-gfw

  • 217: c585877 = 217: d538525 clean: make use of FSCache

  • 218: 9d66057 = 218: bc248c7 Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'

  • 219: e47873c = 219: b2dfcb6 Merge branch 'dont-clean-junctions-fscache'

  • 220: f564e23 = 220: 825d1e4 pack-objects (mingw): demonstrate a segmentation fault with large deltas

  • 221: 4b7e289 = 221: 2b82794 mingw: support long paths

  • 222: a0dca2d = 222: a5c6bd4 win32(long path support): leave drive-less absolute paths intact

  • 223: de52fbe = 223: 4a0d99b compat/fsmonitor/fsm-*-win32: support long paths

  • 224: 3ce466f = 224: dca2648 clean: suggest using core.longPaths if paths are too long to remove

  • 225: e83085b = 225: da17810 mingw: Support git_terminal_prompt with more terminals

  • 226: 4d164db = 226: 10741a0 compat/terminal.c: only use the Windows console if bash 'read -r' fails

  • 227: 63192cb = 227: 9676596 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

  • 228: cfd31bb = 228: c0fdd34 Win32: symlink: move phantom symlink creation to a separate function

  • 229: 93ffedb = 229: 0e1dc89 Introduce helper to create symlinks that knows about index_state

  • 230: 02b6f82 = 230: eab4eae mingw: allow to specify the symlink type in .gitattributes

  • 231: b209b99 = 231: 5c901f4 Win32: symlink: add test for symlink attribute

  • 232: ff0ba2a = 232: 84e2969 mingw: explicitly specify with which cmd to prefix the cmdline

  • 233: dd5262d = 233: 6cc1d94 mingw: when path_lookup() failed, try BusyBox

  • 234: 00d3ff0 = 234: e1ca750 test-tool: learn to act as a drop-in replacement for iconv

  • 235: 46af0f7 = 235: 0959abb tests(mingw): if iconv is unavailable, use test-helper --iconv

  • 236: b0f9b46 = 236: 0bca74b gitattributes: mark .png files as binary

  • 237: d83a873 = 237: 9d4b1d0 tests: move test PNGs into t/lib-diff/

  • 239: ba34c78 = 238: d830ec9 tests: only override sort & find if there are usable ones in /usr/bin/

  • 241: fc158a1 = 239: 102fd93 tests: use the correct path separator with BusyBox

  • 243: d1ac412 = 240: 7c9ddc7 mingw: only use Bash-ism builtin pwd -W when available

  • 245: 892f968 = 241: dbcd644 tests (mingw): remove Bash-specific pwd option

  • 247: a20e934 = 242: 83f3804 test-lib: add BUSYBOX prerequisite

  • 249: 50ad5c4 = 243: 0ecc9e4 t5003: use binary file from t/lib-diff/

  • 238: 7287a99 = 244: a9055ba mingw: introduce code to detect whether we're inside a Windows container

  • 251: ef4b62c = 245: 4db94a0 t5532: workaround for BusyBox on Windows

  • 240: b039f84 = 246: 4cf14a3 mingw: when running in a Windows container, try to rename() harder

  • 253: f861e8f = 247: c2f005f t5605: special-case hardlink test for BusyBox-w32

  • 242: 92ef4c3 = 248: ba605e5 mingw: move the file_attr_to_st_mode() function definition

  • 255: 9b271a8 = 249: 62e07ec t5813: allow for $PWD to be a Windows path

  • 244: a298f7a = 250: b38f058 mingw: Windows Docker volumes are not symbolic links

  • 257: a9ab11c = 251: 8c3d124 t9200: skip tests when $PWD contains a colon

  • 246: 05cfdba = 252: ceb2181 mingw: work around rename() failing on a read-only file

  • 261: 0af7c4e = 253: 6093c40 mingw: optionally enable wsl compability file mode bits

  • 248: f87aa28 = 254: e8f9a26 Merge branch 'gitk-and-git-gui-patches'

  • 250: 6634119 = 255: af351a9 Merge branch 'long-paths'

  • 252: 3ef75e4 = 256: 5e0e357 Merge branch 'msys2'

  • 254: 151b1e1 = 257: d0969a4 Merge 'docker-volumes-are-no-symlinks'

  • 256: b4a6922 = 258: b787e1e mingw: try resetting the read-only bit if rename fails (#4527)

  • 258: 279f859 = 259: 569cad8 Merge pull request #1897 from piscisaureus/symlink-attr

  • 259: 2fe6e8e = 260: a16a551 Describe Git for Windows' architecture [no ci]

  • 260: d2bf77b = 261: 78980e4 mingw: kill child processes in a gentler way

  • 262: dcf9eb0 = 262: 0871cb6 Merge branch 'busybox-w32'

  • 263: 6b825a0 = 263: 0bf1b3d Modify the Code of Conduct for Git for Windows

  • 264: c10361b = 264: afd22d4 mingw: really handle SIGINT

  • 265: 1263784 = 265: 2b61d3d Merge branch 'wsl-file-mode-bits'

  • 266: 0775a69 = 266: 9424030 CONTRIBUTING.md: add guide for first-time contributors

  • 267: f7e41c1 = 267: 23723e9 Partially un-revert "editor: save and reset terminal after calling EDITOR"

  • 268: 349dee9 = 268: 19b4a8b Merge pull request #1170 from dscho/mingw-kill-process

  • 269: 74e646c = 269: 878f15f README.md: Add a Windows-specific preamble

  • 270: 77a3a2e = 270: 9aa3b27 reset: reinstate support for the deprecated --stdin option

  • 271: c102ece = 271: 8a6bea5 Merge branch 'un-revert-editor-save-and-reset'

  • 272: 9ee4812 = 272: 744a320 Add an issue template

  • 273: 75adad5 = 273: ecd2691 Add a GitHub workflow to monitor component updates

  • 274: c6b8196 = 274: 32ff0d1 fsmonitor: reintroduce core.useBuiltinFSMonitor

  • 275: 1b0b361 = 275: 2e28d3a Merge branch 'phase-out-reset-stdin'

  • 276: b7c6ec9 = 276: 2008a9d Modify the GitHub Pull Request template (to reflect Git for Windows)

  • 277: d8e8ba7 = 277: 7542030 dependabot: help keeping GitHub Actions versions up to date

  • 278: 0a00a8e = 278: bfba089 Merge branch 'deprecate-core.useBuiltinFSMonitor'

  • 279: 1015f61 = 279: 4d20249 SECURITY.md: document Git for Windows' policies

  • 280: a9028ff = 280: a954502 Merge pull request #2837 from dscho/monitor-component-updates

  • 281: 8e28316 = 281: c85df10 Merge 'readme' into HEAD