Skip to content

Rebase shears/seen (#22651302295)#19

Open
gitforwindowshelper[bot] wants to merge 274 commits intobase/shears/seen-22651302295from
shears/seen-22651302295
Open

Rebase shears/seen (#22651302295)#19
gitforwindowshelper[bot] wants to merge 274 commits intobase/shears/seen-22651302295from
shears/seen-22651302295

Conversation

@gitforwindowshelper
Copy link

Workflow run

Rebase Summary: seen

From: 3ae2202a91 (Merge 'readme' into HEAD, 2018-06-07) (e594257a33..3ae2202a91)

Resolved: 2c1e27a (pack-objects (mingw): demonstrate a segmentation fault with large deltas, 2014-01-08)

kept only t7429-submodule-long-path.sh entry; dropped t7426-submodule-get-default-remote.sh which was removed upstream

Range-diff
1:  2c1e27a614 ! 1:  9c153cecda pack-objects (mingw): demonstrate a segmentation fault with large deltas
    @@ Commit message
     
      ## t/meson.build ##
     @@ t/meson.build: integration_tests = [
    +   't7423-submodule-symlinks.sh',
        't7424-submodule-mixed-ref-formats.sh',
        't7425-submodule-gitdir-path-extension.sh',
    -   't7426-submodule-get-default-remote.sh',
     +  't7429-submodule-long-path.sh',
        't7450-bad-git-dotfiles.sh',
        't7500-commit-template-squash-signoff.sh',

To: a6da453d03 (Merge 'readme' into HEAD, 2018-06-07) (26338a69bf..a6da453d03)

Statistics

Metric Count
Total conflicts 1
Skipped (upstreamed) 0
Resolved surgically 1
Range-diff (click to expand)
  1:  db284e1707 =   1:  051cf630b6 unix-socket: avoid leak when initialization fails
  2:  328eb95251 =   2:  a6b80367ae grep: prevent `^$` false match at end of file
 15:  8a98d2bab5 =   3:  46f5fa0172 t9350: point out that refs are not updated correctly
 19:  cc9aa5d1db =   4:  e29147e11d transport-helper: add trailing --
 25:  150cdfe339 =   5:  c7246ae69d remote-helper: check helper status after import/export
  3:  e55680b568 =   6:  93c8222e1e vcpkg_install: detect lack of Git
  4:  068844c41e =   7:  9d93b74d0c vcpkg_install: add comment regarding slow network connections
  5:  03eb8686c8 =   8:  92c0ff9b63 vcbuild: install ARM64 dependencies when building ARM64 binaries
  6:  3042d3bf0b =   9:  1f107e5748 vcbuild: add an option to install individual 'features'
  7:  568c283edc =  10:  86a02eb104 cmake: allow building for Windows/ARM64
  8:  aa2a680e3f =  11:  d15bd27a5e mingw: include the Python parts in the build
  9:  ef678d7d2c =  12:  eeb001a2b4 ci(vs-build) also build Windows/ARM64 artifacts
 10:  80eccea851 =  13:  e21ac44130 win32/pthread: avoid name clashes with winpthread
 11:  42b0040be0 =  14:  b7c29b281f Add schannel to curl installation
 18:  f1ee3be2ff =  15:  b3fa226f7c hash-object: demonstrate a >4GB/LLP64 problem
 12:  0988f77e16 =  16:  3e0155175f git-compat-util: avoid redeclaring _DEFAULT_SOURCE
 13:  6bdac7992f =  17:  a164f582c8 cmake(): allow setting HOST_CPU for cross-compilation
 24:  66958e0f45 =  18:  a471bb55b6 object-file.c: use size_t for header lengths
 14:  cbcf0f69c0 =  19:  594b119d0c Import the source code of mimalloc v2.2.7
 16:  71eefeecf3 =  20:  5d457ccdad CMake: default Visual Studio generator has changed
 33:  f37ae619f8 =  21:  437854571f hash algorithms: use size_t for section lengths
 17:  8932cbdd98 =  22:  d7467f05d3 mimalloc: adjust for building inside Git
 20:  0be69d6801 =  23:  72ac3c8d74 mingw: demonstrate a `git add` issue with NTFS junctions
 21:  a499998b37 =  24:  0eddf9314b .gitignore: add Visual Studio CMakeSetting.json file
 74:  cc8f585e97 =  25:  100d96e85e hash-object --stdin: verify that it works with >4GB/LLP64
 22:  181ce7e572 =  26:  eec2af4e9d mimalloc: offer a build-time option to enable it
 23:  2b34fca290 =  27:  a1d44102b2 t5505/t5516: allow running without `.git/branches/` in the templates
 26:  d5aa6e7a29 =  28:  3f57c53e34 clean: do not traverse mount points
 27:  6adfe756d2 =  29:  eb5ed6cd0e strbuf_realpath(): use platform-dependent API if available
 28:  53b4f5a072 =  30:  ae61d5947b http: use new "best effort" strategy for Secure Channel revoke checking
 29:  7128c710d0 =  31:  ac3a5fe132 subtree: update `contrib/subtree` `test` target
 30:  592063ef1f =  32:  d3caf32715 CMakeLists: add default "x64-windows" arch for Visual Studio
 78:  b2f36dd9ea =  33:  0db7052567 hash-object: add another >4GB/LLP64 test case
 79:  4fadb5f11e =  34:  feb90b8e59 setup: properly use "%(prefix)/" when in WSL
 31:  469f66d435 =  35:  eeda5d1f2b mingw: use mimalloc
 32:  c7a6fb975c =  36:  f47b95a365 t5505/t5516: fix white-space around redirectors
 34:  edf43f5621 =  37:  b947f33ffa Always auto-gc after calling a fast-import transport
 35:  da108595af =  38:  f35d7553fa mingw: prevent regressions with "drive-less" absolute paths
 36:  7805ece230 =  39:  c67af85c3a clean: remove mount points when possible
 37:  9431a2cffb =  40:  6f54b43f7a transport: optionally disable side-band-64k
 38:  905f575c5a =  41:  62d758dc1d mingw: fix fatal error working on mapped network drives on Windows
 39:  131e749901 =  42:  0230109f66 clink.pl: fix MSVC compile script to handle libcurl-d.lib
 40:  cae0f822b9 =  43:  190ef92199 mingw: implement a platform-specific `strbuf_realpath()`
 41:  cbf47a8b50 =  44:  4ac052ef13 t3701: verify that we can add *lots* of files interactively
 42:  52bcec436e =  45:  fcd1c45855 commit: accept "scissors" with CR/LF line endings
 43:  ddbdcde463 =  46:  e4ae41c2b0 t0014: fix indentation
 44:  3ce85a3262 =  47:  12bbdf29ab git-gui: accommodate for intent-to-add files
 45:  f0ec7cb1ab =  48:  2a4830adcf mingw: allow for longer paths in `parse_interpreter()`
 46:  3725d7f186 =  49:  e388b673bc compat/vcbuild: document preferred way to build in Visual Studio
 47:  b015db8f89 =  50:  6da6c38c84 http: optionally send SSL client certificate
 48:  bbf7a3210f =  51:  2300561327 ci: run `contrib/subtree` tests in CI builds
 49:  49abcd7650 =  52:  67407d89fb CMake: show Win32 and Generator_platform build-option values
 84:  8cbce69cf2 =  53:  29924bad58 hash-object: add a >4GB/LLP64 test case using filtered input
 85:  e8b3001158 =  54:  d0de868038 compat/mingw.c: do not warn when failing to get owner
 50:  a819c28d7a =  55:  0d89ee6796 windows: skip linking `git-<command>` for built-ins
 51:  746282cff4 =  56:  36c77e4bb8 mingw: stop hard-coding `CC = gcc`
 52:  4b64deb6e1 =  57:  e61d7bb77e mingw: drop the -D_USE_32BIT_TIME_T option
 53:  17d3268230 =  58:  dc5f83bc89 mingw: only use -Wl,--large-address-aware for 32-bit builds
 54:  a65c6b4cdd =  59:  449622d3af mingw: avoid over-specifying `--pic-executable`
 55:  a0deff21b3 =  60:  4c00f2e6c7 mingw: set the prefix and HOST_CPU as per MSYS2's settings
 56:  121fc3f6da =  61:  432ffc872a mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
 57:  2255afcdd1 =  62:  b8a3d6345a mingw: rely on MSYS2's metadata instead of hard-coding it
 58:  2b1763fbe2 =  63:  2b48edc71b mingw: always define `ETC_*` for MSYS2 environments
 59:  c2747584bc =  64:  275df0de2a max_tree_depth: lower it for clang builds in general on Windows
 60:  2a40f5646d =  65:  2770e53367 mingw: ensure valid CTYPE
 61:  ae7ab0dd9f =  66:  dd45b2bf45 mingw: allow `git.exe` to be used instead of the "Git wrapper"
 62:  c006bb20b2 =  67:  e4e8519474 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
 63:  a70d89afef =  68:  8d1c2a6394 clink.pl: fix libexpatd.lib link error when using MSVC
 64:  02ce9d86a0 =  69:  8b437258f3 Makefile: clean up .ilk files when MSVC=1
 65:  160116aac4 =  70:  7d6bd61c00 ci: work around a problem with HTTP/2 vs libcurl v8.10.0
 66:  5578d640e8 !  71:  b3ad314433 vcbuild: add support for compiling Windows resource files
    @@ config.mak.uname: ifeq ($(uname_S),Windows)
     +	SANE_TOOL_PATH ?= $(msvc_bin_dir_msys):$(sdk_ver_bin_dir_msys)
      	HAVE_ALLOCA_H = YesPlease
      	NO_PREAD = YesPlease
    - 	NEEDS_CRYPTO_WITH_SSL = YesPlease
    + 	NO_WRITEV = YesPlease
     @@ config.mak.uname: endif
      	# See https://msdn.microsoft.com/en-us/library/ms235330.aspx
      	EXTLIBS = user32.lib advapi32.lib shell32.lib wininet.lib ws2_32.lib invalidcontinue.obj kernel32.lib ntdll.lib
 67:  42c9a2660b =  72:  69811bd4ba revision: create mark_trees_uninteresting_dense()
 68:  bb8b516607 =  73:  196b82c826 config.mak.uname: add git.rc to MSVC builds
 69:  2a10900689 =  74:  39d5184ab3 MinGW: link as terminal server aware
 70:  8fd7d4bbd1 =  75:  639d07cb06 survey: stub in new experimental 'git-survey' command
 71:  b1553f947f =  76:  9ad0c5f3cd clink.pl: ignore no-stack-protector arg on MSVC=1 builds
 72:  94046394c6 =  77:  94b8cc9804 http: optionally load libcurl lazily
 73:  d74ea79b65 =  78:  91ee2365bd survey: add command line opts to select references
 75:  ecdddd17c1 =  79:  6ae9c01d7b clink.pl: move default linker options for MSVC=1 builds
 76:  44b5b9623e =  80:  0fe68639e1 http: support lazy-loading libcurl also on Windows
 77:  2cddbb2a14 =  81:  8a7ddbe978 survey: start pretty printing data in table form
 80:  9abf5f50ef =  82:  f9c31d3130 Add config option `windows.appendAtomically`
 81:  89b45a7702 =  83:  9c704ee3b4 cmake: install headless-git.
 82:  ac9fe35f70 =  84:  69a86c3f58 http: when loading libcurl lazily, allow for multiple SSL backends
 83:  2791df2b10 =  85:  7ae6465ac4 survey: add object count summary
 86:  071dbc171e =  86:  b398a131f5 mingw: $env:TERM="xterm-256color" for newer OSes
 87:  3be1cdfffe =  87:  167e9e163c winansi: check result and Buffer before using Name
 88:  0a6957bd13 =  88:  c1a835ec30 mingw: change core.fsyncObjectFiles = 1 by default
 89:  b56da9fd49 =  89:  7e5885d972 Fix Windows version resources
 90:  71bd8c24f5 =  90:  6d42bdbc9a status: fix for old-style submodules with commondir
 91:  7f71b8c189 =  91:  5b3d0de7d6 git.rc: include winuser.h
 92:  fc9f5083b6 =  92:  9bc3266b9f mingw: do load libcurl dynamically by default
 93:  cfc3d75316 =  93:  4308f01c7f Add a GitHub workflow to verify that Git/Scalar work in Nano Server
 94:  119cd8d8e3 =  94:  7388bebdcb mingw: suggest `windows.appendAtomically` in more cases
 95:  e93ab546a4 =  95:  a2f6ad1cc8 win32: use native ANSI sequence processing, if possible
 96:  abe7738219 =  96:  b6c8eb3638 common-main.c: fflush stdout buffer upon exit
 97:  e2dd810b0e =  97:  05e449fd7e t5601/t7406(mingw): do run tests with symlink support
 98:  2af2f6ccd1 =  98:  e5532ee535 win32: ensure that `localtime_r()` is declared even in i686 builds
 99:  78b379bf57 =  99:  a0350708a5 Fallback to AppData if XDG_CONFIG_HOME is unset
100:  862a3ea36c = 100:  313b65cfcb run-command: be helpful with Git LFS fails on Windows 7
101:  da06eb8cf9 = 101:  be14f8887d survey: summarize total sizes by object type
102:  61923c5931 = 102:  70a50e58e7 survey: show progress during object walk
103:  1402542506 = 103:  355dee336d mingw: make sure `errno` is set correctly when socket operations fail
104:  b493b5dfbe = 104:  7805a9bb31 survey: add ability to track prioritized lists
105:  591ea7869f = 105:  ab637d0a77 compat/mingw: handle WSA errors in strerror
106:  d30995fa61 = 106:  609ad086f7 survey: add report of "largest" paths
107:  f8bffaaa82 = 107:  e6c4f1a54c compat/mingw: drop outdated comment
108:  43311cf73f = 108:  ce8988b2bb survey: add --top=<N> option and config
109:  20575e07aa = 109:  907a9b7c99 t0301: actually test credential-cache on Windows
110:  1bb670c1bc = 110:  68508e8875 survey: clearly note the experimental nature in the output
111:  037d1e6339 = 111:  b06622d049 credential-cache: handle ECONNREFUSED gracefully
112:  fb5d3e68a8 = 112:  899e93fa35 reftable: do make sure to use custom allocators
113:  c138feb66c = 113:  d13fe8e746 check-whitespace: avoid alerts about upstream commits
114:  51ce6b05bf = 114:  7c70d852d2 t/t5571-prep-push-hook.sh: Add test with writing to stderr
115:  272b15548f = 115:  345f96a2e1 git-svn: mark it as unsupported by the Git for Windows project
116:  9b51abc516 = 116:  1c66a01587 ci(macos): skip the `git p4` tests
117:  6ab81d3d6c = 117:  73d005d084 Win32: make FILETIME conversion functions public
118:  78a799e69b = 118:  65c47e243d Win32: dirent.c: Move opendir down
119:  0404c3c22c = 119:  75216b66cc mingw: make the dirent implementation pluggable
120:  1de0e84dde = 120:  309c357dd6 Win32: make the lstat implementation pluggable
121:  e7e76203f9 = 121:  cee13ae3fd mingw: add infrastructure for read-only file system level caches
122:  c162f700dd = 122:  ea0a9dc5dc mingw: add a cache below mingw's lstat and dirent implementations
123:  daa945ab3a = 123:  b6c382007e fscache: load directories only once
124:  db3b1917b5 = 124:  0cd916769c fscache: add key for GIT_TRACE_FSCACHE
125:  89a822f5cf = 125:  c7328f46f5 fscache: remember not-found directories
126:  4ba18e1fc9 = 126:  e967ec434b fscache: add a test for the dir-not-found optimization
127:  d71d41fcce = 127:  5497203e2c add: use preload-index and fscache for performance
128:  6b3ac05563 = 128:  99ecc56bc2 dir.c: make add_excludes aware of fscache during status
129:  a126c9eff4 = 129:  ef9ec0c3a3 fscache: make fscache_enabled() public
130:  18a88726aa = 130:  bb894677c1 dir.c: regression fix for add_excludes with fscache
131:  11cc189fde = 131:  69d7ad9eb2 fetch-pack.c: enable fscache for stats under .git/objects
132:  528ad974ec = 132:  fb588b0357 checkout.c: enable fscache for checkout again
133:  35b73993df = 133:  2947b08b28 Enable the filesystem cache (fscache) in refresh_index().
134:  2eb1050bb5 = 134:  085ebbdfa0 fscache: use FindFirstFileExW to avoid retrieving the short name
135:  a3f31683b0 = 135:  fad5352d7c fscache: add GIT_TEST_FSCACHE support
136:  be7dad0803 = 136:  8c2756dc8e fscache: add fscache hit statistics
137:  5d3c916d03 = 137:  496ef911bd unpack-trees: enable fscache for sparse-checkout
138:  73ce0ad72b = 138:  f315db52f0 status: disable and free fscache at the end of the status command
139:  392b71ad05 = 139:  810e52c7d2 mem_pool: add GIT_TRACE_MEMPOOL support
140:  4d5e994d73 = 140:  9892da1dce fscache: fscache takes an initial size
141:  612c243a0b = 141:  5e3cf74d86 fscache: update fscache to be thread specific instead of global
142:  8f4151b4c7 = 142:  1f98ab91b7 fscache: teach fscache to use mempool
143:  b8bbb8cf1d = 143:  9306f1cd3e fscache: make fscache_enable() thread safe
144:  4ff71fd0c5 = 144:  656577457d fscache: teach fscache to use NtQueryDirectoryFile
145:  6ea718dfe0 = 145:  a8af7881e8 fscache: remember the reparse tag for each entry
146:  4e71c68f9a = 146:  8712d5f3e0 fscache: implement an FSCache-aware is_mount_point()
157:  297cad47ef = 147:  8288084f66 git-gui--askyesno: fix funny text wrapping
147:  0ca0307505 = 148:  9be88d5fe8 clean: make use of FSCache
159:  6a8e8f56c4 = 149:  95d8d1bc03 git-gui--askyesno (mingw): use Git for Windows' icon, if available
148:  2c1e27a614 ! 150:  9c153cecda pack-objects (mingw): demonstrate a segmentation fault with large deltas
    @@ Commit message
     
      ## t/meson.build ##
     @@ t/meson.build: integration_tests = [
    +   't7423-submodule-symlinks.sh',
        't7424-submodule-mixed-ref-formats.sh',
        't7425-submodule-gitdir-path-extension.sh',
    -   't7426-submodule-get-default-remote.sh',
     +  't7429-submodule-long-path.sh',
        't7450-bad-git-dotfiles.sh',
        't7500-commit-template-squash-signoff.sh',
149:  9f0416bc3b = 151:  31fea3dc73 mingw: support long paths
150:  0b61dd18ca = 152:  66b3db9292 win32(long path support): leave drive-less absolute paths intact
151:  2c0f472eea = 153:  bb5b64f289 compat/fsmonitor/fsm-*-win32: support long paths
152:  ba0d89527e = 154:  502dcd9ed8 clean: suggest using `core.longPaths` if paths are too long to remove
153:  6acb63d589 = 155:  7daccd5d21 mingw: Support `git_terminal_prompt` with more terminals
154:  ad04a5bde4 = 156:  47aa5e1827 compat/terminal.c: only use the Windows console if bash 'read -r' fails
155:  72446f30c1 = 157:  23ff646c67 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
162:  eb53a442a6 = 158:  06271cbf9c Win32: symlink: move phantom symlink creation to a separate function
163:  9f5f352f84 = 159:  f75c8dee9b Introduce helper to create symlinks that knows about index_state
164:  33166fe220 = 160:  4175e8a6d5 mingw: allow to specify the symlink type in .gitattributes
165:  385c1c47f5 = 161:  0ab7fb62a9 Win32: symlink: add test for `symlink` attribute
166:  56702f5f2e = 162:  869b70a7d7 mingw: explicitly specify with which cmd to prefix the cmdline
167:  9d76fa310e = 163:  d21f76af6c mingw: when path_lookup() failed, try BusyBox
168:  0d75cc6d73 = 164:  b58d8a37c0 test-tool: learn to act as a drop-in replacement for `iconv`
169:  affb30303f = 165:  1052b0bcbf tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
170:  6de6ed50ae = 166:  f12ac18669 gitattributes: mark .png files as binary
171:  6f989f2f2f = 167:  49497d4751 tests: move test PNGs into t/lib-diff/
172:  6ab37f46af = 168:  af87e07d38 tests: only override sort & find if there are usable ones in /usr/bin/
173:  6b2fb3fa5f = 169:  695b4d8da7 tests: use the correct path separator with BusyBox
174:  96d408a72c = 170:  fd5951de5b mingw: only use Bash-ism `builtin pwd -W` when available
175:  221abaaf5b = 171:  5bee01d00f tests (mingw): remove Bash-specific pwd option
176:  69eeb98c87 = 172:  9fbd0a2743 test-lib: add BUSYBOX prerequisite
178:  e934a8dc4d = 173:  eeea461557 t5003: use binary file from t/lib-diff/
177:  cd5d05efdf = 174:  9eb305d1ee Describe Git for Windows' architecture [no ci]
156:  baed9be167 = 175:  0ca051e5ab mingw: introduce code to detect whether we're inside a Windows container
180:  f57843d78e = 176:  f1290ec8da t5532: workaround for BusyBox on Windows
179:  ac28ea1ca9 = 177:  dccb655dab Modify the Code of Conduct for Git for Windows
158:  ff25190a8b = 178:  a924c30b4e mingw: when running in a Windows container, try to rename() harder
182:  83ca26cfa2 = 179:  53bd9f10b6 t5605: special-case hardlink test for BusyBox-w32
181:  04039669d7 = 180:  53a70d9f24 CONTRIBUTING.md: add guide for first-time contributors
160:  0777246c5d = 181:  d72682831d mingw: move the file_attr_to_st_mode() function definition
184:  6f85a230bc = 182:  f0814840d3 t5813: allow for $PWD to be a Windows path
183:  39dcf176ba = 183:  58865aca2d README.md: Add a Windows-specific preamble
161:  2d234eb250 = 184:  e5a3a4f6d2 mingw: Windows Docker volumes are *not* symbolic links
186:  183b7a2949 = 185:  1a13c33748 t9200: skip tests when $PWD contains a colon
187:  843f1a753f = 186:  b4c56089a5 mingw: kill child processes in a gentler way
185:  74823d8760 = 187:  9c2439fcd2 Add an issue template
188:  9991774a69 = 188:  ef6045de23 Add a GitHub workflow to monitor component updates
190:  8b5694c92a = 189:  6ce5839b9f mingw: work around rename() failing on a read-only file
191:  115204e8a0 = 190:  fa122cca8e mingw: optionally enable wsl compability file mode bits
192:  1b14aa8c72 = 191:  5b841d727a mingw: really handle SIGINT
193:  362b6c0be0 = 192:  8f369112c3 Partially un-revert "editor: save and reset terminal after calling EDITOR"
194:  4f2604239f = 193:  7202187f2c reset: reinstate support for the deprecated --stdin option
195:  63cecba4f4 = 194:  80f62448a5 fsmonitor: reintroduce core.useBuiltinFSMonitor
189:  f360a922ed = 195:  32f69a7fff Modify the GitHub Pull Request template (to reflect Git for Windows)
196:  fd441d91d7 = 196:  e360fc2f26 dependabot: help keeping GitHub Actions versions up to date
197:  492d8a0787 = 197:  e4a2f89baf SECURITY.md: document Git for Windows' policies

PhilipOakley and others added 30 commits March 4, 2026 01:46
The vcpkg_install batch file depends on the availability of a
working Git on the CMD path. This may not be present if the user
has selected the 'bash only' option during Git-for-Windows install.

Detect and tell the user about their lack of a working Git in the CMD
window.

Fixes git-for-windows#2348.
A separate PR git-for-windows/build-extra#258
now highlights the recommended path setting during install.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
There are no Windows/ARM64 agents in GitHub Actions yet, therefore we
just skip adjusting the `vs-test` job for now.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The intention of this change is to align with how the top-level git
`Makefile` defines its own test target (which also internally calls
`$(MAKE) -C t/ all`). This change also ensures the consistency of
`make -C contrib/subtree test` with other testing in CI executions
(which rely on `$DEFAULT_TEST_TARGET` being defined as `prove`).

Signed-off-by: Victoria Dye <vdye@github.com>
In Git-for-Windows, work on using ARM64 has progressed. The
commit 2d94b77 (cmake: allow building for Windows/ARM64, 2020-12-04)
failed to notice that /compat/vcbuild/vcpkg_install.bat will default to
using the "x64-windows" architecture for the vcpkg installation if not set,
but CMake is not told of this default. Commit 635b6d9 (vcbuild: install
ARM64 dependencies when building ARM64 binaries, 2020-01-31) later updated
vcpkg_install.bat to accept an arch (%1) parameter, but retained the default.

This default is neccessary for the use case where the project directory is
opened directly in Visual Studio, which will find and build a CMakeLists.txt
file without any parameters, thus expecting use of the default setting.

Also Visual studio will generate internal .sln solution and .vcxproj project
files needed for some extension tools. Inform users of the additional
.sln/.vcxproj generation.

** How to test:
 rm -rf '.vs' # remove old visual studio settings
 rm -rf 'compat/vcbuild/vcpkg' # remove any vcpkg downloads
 rm -rf 'contrib/buildsystems/out' # remove builds & CMake artifacts
 with a fresh Visual Studio Community Edition, File>>Open>>(git *folder*)
   to load the project (which will take some time!).
 check for successful compilation.
The implicit .sln (etc.) are in the hidden .vs directory created by
Visual Studio.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
To complement the `--stdin` and `--literally` test cases that verify
that we can hash files larger than 4GB on 64-bit platforms using the
LLP64 data model, here is a test case that exercises `hash-object`
_without_ any options.

Just as before, we use the `big` file from the previous test case if it
exists to save on setup time, otherwise generate it.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
After importing anything with fast-import, we should always let the
garbage collector do its job, since the objects are written to disk
inefficiently.

This brings down an initial import of http://selenic.com/hg from about
230 megabytes to about 14.

In the future, we may want to make this configurable on a per-remote
basis, or maybe teach fast-import about it in the first place.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, there are several categories of absolute paths. One such
category starts with a backslash and is implicitly relative to the drive
associated with the current working directory. Example:

	c:
	git clone https://github.com/git-for-windows/git \G4W

should clone into C:\G4W.

Back in 2017, Juan Carlos Arevalo Baeza reported a bug in Git's handling
of those absolute paths was identified, and fixed. Let's make sure that
it stays fixed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Windows' equivalent to "bind mounts", NTFS junction points, can be
unlinked without affecting the mount target. This is clearly what users
expect to happen when they call `git clean -dfx` in a worktree that
contains NTFS junction points: the junction should be removed, and the
target directory of said junction should be left alone (unless it is
inside the worktree).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
While Git for Windows does not _ship_ Python (in order to save on
bandwidth), MSYS2 provides very fine Python interpreters that users can
easily take advantage of, by using Git for Windows within its SDK.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Thorough benchmarking with repacking a subset of linux.git (the commit
history reachable from 93a6fef ([PATCH] fix the SYSCTL=n compilation,
2007-02-28), to be precise) suggest that this allocator is on par, in
multi-threaded situations maybe even better than nedmalloc:

`git repack -adfq` with mimalloc, 8 threads:

31.166991900 27.576763800 28.712311000 27.373859000 27.163141900

`git repack -adfq` with nedmalloc, 8 threads:

31.915032900 27.149883100 28.244933700 27.240188800 28.580849500

In a different test using GitHub Actions build agents (probably
single-threaded, a core-strength of nedmalloc)):

`git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with mimalloc:

943.426 978.500 939.709 959.811 954.605

`git repack -q -d -l -A --unpack-unreachable=2.weeks.ago` with nedmalloc:

995.383 952.179 943.253 963.043 980.468

While these measurements were not executed with complete scientific
rigor, as no hardware was set aside specifically for these benchmarks,
it shows that mimalloc and nedmalloc perform almost the same, nedmalloc
with a bit higher variance and also slightly higher average (further
testing suggests that nedmalloc performs worse in multi-threaded
situations than in single-threaded ones).

In short: mimalloc seems to be slightly better suited for our purposes
than nedmalloc.

Seeing that mimalloc is developed actively, while nedmalloc ceased to
see any updates in eight years, let's use mimalloc on Windows instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since commit 0c499ea (send-pack: demultiplex a sideband stream with
status data, 2010-02-05) the send-pack builtin uses the side-band-64k
capability if advertised by the server.

Unfortunately this breaks pushing over the dump git protocol if used
over a network connection.

The detailed reasons for this breakage are (by courtesy of Jeff Preshing,
quoted from https://groups.google.com/d/msg/msysgit/at8D7J-h7mw/eaLujILGUWoJ):

	MinGW wraps Windows sockets in CRT file descriptors in order to
	mimic the functionality of POSIX sockets. This causes msvcrt.dll
	to treat sockets as Installable File System (IFS) handles,
	calling ReadFile, WriteFile, DuplicateHandle and CloseHandle on
	them. This approach works well in simple cases on recent
	versions of Windows, but does not support all usage patterns. In
	particular, using this approach, any attempt to read & write
	concurrently on the same socket (from one or more processes)
	will deadlock in a scenario where the read waits for a response
	from the server which is only invoked after the write. This is
	what send_pack currently attempts to do in the use_sideband
	codepath.

The new config option `sendpack.sideband` allows to override the
side-band-64k capability of the server, and thus makes the dumb git
protocol work.

Other transportation methods like ssh and http/https still benefit from
the sideband channel, therefore the default value of `sendpack.sideband`
is still true.

Signed-off-by: Thomas Braun <thomas.braun@byte-physics.de>
Signed-off-by: Oliver Schneider <oliver@assarbad.net>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In 1e64d18 (mingw: do resolve symlinks in `getcwd()`) a problem was
introduced that causes git for Windows to stop working with certain
mapped network drives (in particular, drives that are mapped to
locations with long path names). Error message was "fatal: Unable to
read current working directory: No such file or directory". Present
change fixes this issue as discussed in
git-for-windows#2480

Signed-off-by: Bjoern Mueller <bjoernm@gmx.de>
Update clink.pl to link with either libcurl.lib or libcurl-d.lib
depending on whether DEBUG=1 is set.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
There is a Win32 API function to resolve symbolic links, and we can use
that instead of resolving them manually. Even better, this function also
resolves NTFS junction points (which are somewhat similar to bind
mounts).

This fixes git-for-windows#2481.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The native Windows HTTPS backend is based on Secure Channel which lets
the caller decide how to handle revocation checking problems caused by
missing information in the certificate or offline CRL distribution
points.

Unfortunately, cURL chose to handle these problems differently than
OpenSSL by default: while OpenSSL happily ignores those problems
(essentially saying "¯\_(ツ)_/¯"), the Secure Channel backend will error
out instead.

As a remedy, the "no revoke" mode was introduced, which turns off
revocation checking altogether. This is a bit heavy-handed. We support
this via the `http.schannelCheckRevoke` setting.

In curl/curl#4981, we contributed an opt-in
"best effort" strategy that emulates what OpenSSL seems to do.

In Git for Windows, we actually want this to be the default. This patch
makes it so, introducing it as a new value for the
`http.schannelCheckRevoke" setting, which now becmes a tristate: it
accepts the values "false", "true" or "best-effort" (defaulting to the
last one).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The convention in Git project's shell scripts is to have white-space
_before_, but not _after_ the `>` (or `<`).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This change enhances `git commit --cleanup=scissors` by detecting
scissors lines ending in either LF (UNIX-style) or CR/LF (DOS-style).

Regression tests are included to specifically test for trailing
comments after a CR/LF-terminated scissors line.

Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
For some reason, this test case was indented with 4 spaces instead of 1
horizontal tab. The other test cases in the same test script are fine.

Signed-off-by: Jens Glathe <jens.glathe@oldschoolsolutions.biz>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As of Git v2.28.0, the diff for files staged via `git add -N` marks them
as new files. Git GUI was ill-prepared for that, and this patch teaches
Git GUI about them.

Please note that this will not even fix things with v2.28.0, as the
`rp/apply-cached-with-i-t-a` patches are required on Git's side, too.

This fixes git-for-windows#2779

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
The vcpkg downloads may not succeed. Warn careful readers of the time out.

A simple retry will usually resolve the issue.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Git's regular Makefile mentions that HOST_CPU should be defined when cross-compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L438-L439

This is then used to set the GIT_HOST_CPU variable when compiling Git: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/Makefile#L1337-L1341

Then, when the user runs `git version --build-options`, it returns that value: https://github.com/git-for-windows/git/blob/37796bca76ef4180c39ee508ca3e42c0777ba444/help.c#L658

This commit adds the same functionality to the CMake configuration. Users can now set -DHOST_CPU= to set the target architecture.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
As reported in newren/git-filter-repo#225, it
looks like 99 bytes is not really sufficient to represent e.g. the full
path to Python when installed via Windows Store (and this path is used
in the hasb bang line when installing scripts via `pip`).

Let's increase it to what is probably the maximum sensible path size:
MAX_PATH. This makes `parse_interpreter()` in line with what
`lookup_prog()` handles.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Vilius Šumskas <vilius@sumskas.eu>
We used to have that `make vcxproj` hack, but a hack it is. In the
meantime, we have a much cleaner solution: using CMake, either
explicitly, or even more conveniently via Visual Studio's built-in CMake
support (simply open Git's top-level directory via File>Open>Folder...).

Let's let the `README` reflect this.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This adds support for a new http.sslAutoClientCert config value.

In cURL 7.77 or later the schannel backend does not automatically send
client certificates from the Windows Certificate Store anymore.

This config value is only used if http.sslBackend is set to "schannel",
and can be used to opt in to the old behavior and force cURL to send
client certificates.

This fixes git-for-windows#3292

Signed-off-by: Pascal Muller <pascalmuller@gmail.com>
Because `git subtree` (unlike most other `contrib` modules) is included as
part of the standard release of Git for Windows, its stability should be
verified as consistently as it is for the rest of git. By including the
`git subtree` tests in the CI workflow, these tests are as much of a gate to
merging and indicator of stability as the standard test suite.

Signed-off-by: Victoria Dye <vdye@github.com>
Ensure key CMake option values are part of the CMake output to
facilitate user support when tool updates impact the wider CMake
actions, particularly ongoing 'improvements' in Visual Studio.

These CMake displays perform the same function as the build-options.txt
provided in the main Git for Windows. CMake is already chatty.
The setting of CMAKE_EXPORT_COMPILE_COMMANDS is also reported.

Include the environment's CMAKE_EXPORT_COMPILE_COMMANDS value which
may have been propogated to CMake's internal value.

Testing the CMAKE_EXPORT_COMPILE_COMMANDS processing can be difficult
in the Visual Studio environment, as it may be cached in many places.
The 'environment' may include the OS, the user shell, CMake's
own environment, along with the Visual Studio presets and caches.

See previous commit for arefacts that need removing for a clean test.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
To verify that the `clean` side of the `clean`/`smudge` filter code is
correct with regards to LLP64 (read: to ensure that `size_t` is used
instead of `unsigned long`), here is a test case using a trivial filter,
specifically _not_ writing anything to the object store to limit the
scope of the test case.

As in previous commits, the `big` file from previous test cases is
reused if available, to save setup time, otherwise re-generated.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho and others added 29 commits March 4, 2026 01:48
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>
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>
To support Git Bash running in a MinTTY, we use a dirty trick to access
the MSYS2 pseudo terminal: we execute a Bash snippet that accesses
/dev/tty.

The idea was to fall back to writing to/reading from CONOUT$/CONIN$ if
that Bash call failed because Bash was not found.

However, we should fall back even in other error conditions, because we
have not successfully read the user input. Let's make it so.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
... even if they may look like them.

As looking up the target of the "symbolic link" (just to see whether it
starts with `/ContainerMappedDirectories/`) is pretty expensive, we
do it when we can be *really* sure that there is a possibility that this
might be the case.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: JiSeop Moon <zcube@zcube.kr>
At least on _some_ APFS network shares, Git fails to rename the object
files because they are marked as read-only, because that has the effect
of setting the uchg flag on APFS, which then means the file can't be
renamed or deleted.

To work around that, when a rename failed, and the read-only flag is
set, try to turn it off and on again.

This fixes git-for-windows#4482

Signed-off-by: David Lomas <dl3@pale-eds.co.uk>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To verify that the symlink is resolved correctly, we use the fact that
`git.exe` is a native Win32 program, and that `git.exe config -f <path>`
therefore uses the native symlink resolution.

Signed-off-by: Bert Belder <bertbelder@gmail.com>
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>
The Windows Subsystem for Linux (WSL) version 2 allows to use `chmod` on
NTFS volumes provided that they are mounted with metadata enabled (see
https://devblogs.microsoft.com/commandline/chmod-chown-wsl-improvements/
for details), for example:

	$ chmod 0755 /mnt/d/test/a.sh

In order to facilitate better collaboration between the Windows
version of Git and the WSL version of Git, we can make the Windows
version of Git also support reading and writing NTFS file modes
in a manner compatible with WSL.

Since this slightly slows down operations where lots of files are
created (such as an initial checkout), this feature is only enabled when
`core.WSLCompat` is set to true. Note that you also have to set
`core.fileMode=true` in repositories that have been initialized without
enabling WSL compatibility.

There are several ways to enable metadata loading for NTFS volumes
in WSL, one of which is to modify `/etc/wsl.conf` by adding:

```
[automount]
enabled = true
options = "metadata,umask=027,fmask=117"
```

And reboot WSL.

It can also be enabled temporarily by this incantation:

	$ sudo umount /mnt/c &&
	  sudo mount -t drvfs C: /mnt/c -o metadata,uid=1000,gid=1000,umask=22,fmask=111

It's important to note that this modification is compatible with, but
does not depend on WSL. The helper functions in this commit can operate
independently and functions normally on devices where WSL is not
installed or properly configured.

Signed-off-by: xungeng li <xungeng@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Previously, we did not install any handler for Ctrl+C, but now we really
want to because the MSYS2 runtime learned the trick to call the
ConsoleCtrlHandler when Ctrl+C was pressed.

With this, hitting Ctrl+C while `git log` is running will only terminate
the Git process, but not the pager. This finally matches the behavior on
Linux and on macOS.

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>
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>
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>
This was pull request git-for-windows#1645 from ZCube/master

Support windows container.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
…ws#4527)

With this patch, Git for Windows works as intended on mounted APFS
volumes (where renaming read-only files would fail).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch introduces support to set special NTFS attributes that are
interpreted by the Windows Subsystem for Linux as file mode bits, UID
and GID.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Handle Ctrl+C in Git Bash nicely

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>
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>
…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>
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.