Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to v2.46.0-rc0 #5056

Merged
merged 1,151 commits into from
Jul 15, 2024
Merged

Conversation

dscho
Copy link
Member

@dscho dscho commented Jul 12, 2024

This is the regular PR to benefit from the PR build.

Range-diff relative to
  • 1: f589d8d = 1: 26550a9 gitk(Windows): avoid inadvertently calling executables in the worktree

  • 2: abb9d1a = 2: 13241c6 t9350: point out that refs are not updated correctly

  • 3: 9b77b71 = 3: f2322e9 transport-helper: add trailing --

  • 4: 294de0e = 4: fcf85d7 remote-helper: check helper status after import/export

  • 7: 5cf4355 = 5: 7024c36 mingw: demonstrate a problem with certain absolute paths

  • 8: 47d6e2e = 6: 12ba7b0 clean: do not traverse mount points

  • 5: 0b5eed9 ! 7: 072f5fc Always auto-gc after calling a fast-import transport

    @@ transport-helper.c
     +static int auto_gc = 1;
      
      struct helper_data {
    - 	const char *name;
    + 	char *name;
     @@ transport-helper.c: static int fetch_with_import(struct transport *transport,
      		}
      	}
  • 10: 382b72f = 8: 48d5b8e mingw: allow absolute paths without drive prefix

  • 11: de80261 = 9: 310d96c clean: remove mount points when possible

  • 6: daedabf = 10: 3eddbf0 mingw: include the Python parts in the build

  • 9: a505fd6 = 11: 95736c5 win32/pthread: avoid name clashes with winpthread

  • 12: d21fef2 = 12: bc214cd git-compat-util: avoid redeclaring _DEFAULT_SOURCE

  • 13: 075ab9c = 13: 4e0f37e Import the source code of mimalloc v2.1.2

  • 14: 4b35ad1 = 14: 94111ce mimalloc: adjust for building inside Git

  • 15: b884986 = 15: 74db63c mimalloc: offer a build-time option to enable it

  • 16: 7c61188 = 16: 9556043 mimalloc: use "weak" random seed when statically linked

  • 17: 31c3a61 = 17: 7b848e5 mingw: use mimalloc

  • 18: 0f34fe1 = 18: 96e8caa transport: optionally disable side-band-64k

  • 19: 88a301a = 19: ba699c7 mingw: make sure errno is set correctly when socket operations fail

  • 20: 7b39cb3 = 20: 160bfea mingw: do resolve symlinks in getcwd()

  • 21: 2b2dc89 = 21: 69369fe mingw: fix fatal error working on mapped network drives on Windows

  • 30: 5af8f39 = 22: 92be77e vcxproj: unclash project directories with build outputs

  • 23: 8fc00dd = 23: ffcb4be mingw: ensure valid CTYPE

  • 24: b434881 = 24: 1a91da9 mingw: demonstrate a git add issue with NTFS junctions

  • 31: 1823346 = 25: 51fb690 t5505/t5516: allow running without .git/branches/ in the templates

  • 25: 8679d38 = 26: f909fbf mingw: allow git.exe to be used instead of the "Git wrapper"

  • 26: c5562e3 = 27: d083e1b strbuf_realpath(): use platform-dependent API if available

  • 32: 7a45f6d = 28: 72d29cd t5505/t5516: fix white-space around redirectors

  • 27: 34e6478 = 29: c0bb70a mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

  • 28: 667361c = 30: 3deed45 http: use new "best effort" strategy for Secure Channel revoke checking

  • 22: 8ee8d78 = 31: 3ca841a clink.pl: fix MSVC compile script to handle libcurl-d.lib

  • 29: 416132f = 32: 15ea6fd mingw: implement a platform-specific strbuf_realpath()

  • 38: db352d1 = 33: 08bbe39 clink.pl: fix libexpatd.lib link error when using MSVC

  • 39: a973f57 = 34: 0318d5f Makefile: clean up .ilk files when MSVC=1

  • 40: fa9a0d1 = 35: 589b856 vcbuild: add support for compiling Windows resource files

  • 41: 830217b = 36: 444d7d7 config.mak.uname: add git.rc to MSVC builds

  • 42: ddd2a24 = 37: 0b96f5d clink.pl: ignore no-stack-protector arg on MSVC=1 builds

  • 43: 8c32014 = 38: 78096c0 clink.pl: move default linker options for MSVC=1 builds

  • 33: 673f572 = 39: 8e76dae t3701: verify that we can add lots of files interactively

  • 34: a730a97 = 40: c15927c git add -i: handle CR/LF line endings in the interactive input

  • 35: 9278f45 = 41: 02c1b8a commit: accept "scissors" with CR/LF line endings

  • 36: d19e495 ! 42: 94da1a4 t0014: fix indentation

    @@ t/t0014-alias.sh: test_expect_success 'looping aliases - internal execution' '
     +	test_cmp expect actual
      '
      
    - test_done
    + test_expect_success 'tracing a shell alias with arguments shows trace of prepared command' '
  • 37: aef280c = 43: da9671f git-gui: accommodate for intent-to-add files

  • 47: fa1c483 = 44: 4b85d4a vcpkg_install: detect lack of Git

  • 49: 4c34d18 = 45: 653406e vcpkg_install: add comment regarding slow network connections

  • 51: 75ce41a = 46: 143e834 vcxproj: support building Windows/ARM64 binaries

  • 52: 91796ca = 47: 8d3150b vcbuild: install ARM64 dependencies when building ARM64 binaries

  • 44: 3e26a6c = 48: bfdb850 buildsystems: remove duplicate clause

  • 53: 2100f36 = 49: be117f2 vcbuild: add an option to install individual 'features'

  • 45: 1cb4621 = 50: 4814f49 vcxproj: handle resource files, too

  • 54: 6d2ffb2 = 51: 87dc592 cmake: allow building for Windows/ARM64

  • 46: f8c572d = 52: 205141e vcxproj: ignore -fno-stack-protector and -fno-common

  • 55: b62bb95 = 53: 31477fd ci(vs-build) also build Windows/ARM64 artifacts

  • 48: 89bf9dc = 54: 3d65a6e vcxproj: handle GUI programs, too

  • 56: fb6b9c1 = 55: bc9ae15 Add schannel to curl installation

  • 50: ffc291a = 56: ee5ebd9 cmake: install headless-git.

  • 57: 30fc06b = 57: 341ea21 cmake(): allow setting HOST_CPU for cross-compilation

  • 63: 08399cc = 58: fb0110b CMake: default Visual Studio generator has changed

  • 64: 7da1dbd = 59: f583df4 .gitignore: add Visual Studio CMakeSetting.json file

  • 58: 9f2bb4b = 60: f2f0f0b subtree: update contrib/subtree test target

  • 65: 3c1c6b2 = 61: d1b887a CMakeLists: add default "x64-windows" arch for Visual Studio

  • 59: 94a5123 = 62: 05062de ci(vs-build): download the vcpkg artifacts using a dedicated Action

  • 60: e5ca181 = 63: 7639b90 mingw: allow for longer paths in parse_interpreter()

  • 61: cad1357 = 64: 5b8d2d1 compat/vcbuild: document preferred way to build in Visual Studio

  • 62: ffc4930 = 65: 0585825 http: optionally send SSL client certificate

  • 66: 31aad70 ! 66: 2849e28 ci: run contrib/subtree tests in CI builds

    @@ ci/run-build-and-tests.sh: then
     
      ## ci/run-test-slice.sh ##
     @@ ci/run-test-slice.sh: if [ "$1" == "0" ] ; then
    - 	group "Run unit tests" make --quiet -C t unit-tests-prove
    + 	group "Run unit tests" make --quiet -C t unit-tests-test-tool
      fi
      
     +# Run the git subtree tests only if main tests succeeded
  • 67: cca9315 = 67: 7ef02bb CMake: show Win32 and Generator_platform build-option values

  • 68: e37ea80 ! 68: ffdd556 init: do parse all core.* settings early

    @@ config.h: typedef int (*config_fn_t)(const char *, const char *,
     
      ## setup.c ##
     @@ setup.c: int init_db(const char *git_dir, const char *real_git_dir,
    - 	startup_info->have_repository = 1;
    - 
    - 	/* Ensure `core.hidedotfiles` is processed */
    + 	 * have set up the repository format such that we can evaluate
    + 	 * includeIf conditions correctly in the case of re-initialization.
    + 	 */
     -	git_config(platform_core_config, NULL);
     +	git_config(git_default_core_config, NULL);
      
  • 75: 0508c6a = 69: 2f3d2c9 Enable the built-in FSMonitor as an experimental feature

  • 69: 958f330 ! 70: 340b1a0 hash-object: demonstrate a >4GB/LLP64 problem

    @@ t/t1007-hash-object.sh: test_expect_success 'setup' '
      	EOF
      '
      
    -@@ t/t1007-hash-object.sh: test_expect_success '--literally with extra-long type' '
    - 	echo example | git hash-object -t $t --literally --stdin
    +@@ t/t1007-hash-object.sh: test_expect_success '--stdin outside of repository (uses SHA-1)' '
    + 	test_cmp expect actual
      '
      
     +test_expect_failure EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
  • 70: e335a51 = 71: a1c7d33 write_object_file_literally(): use size_t

  • 71: aac4f01 = 72: a674e8f object-file.c: use size_t for header lengths

  • 72: 41e7133 ! 73: 0713ec4 hash algorithms: use size_t for section lengths

    @@ sha1dc_git.h: void git_SHA1DCInit(SHA1_CTX *);
      #define platform_SHA_CTX SHA1_CTX
     
      ## t/t1007-hash-object.sh ##
    -@@ t/t1007-hash-object.sh: test_expect_success '--literally with extra-long type' '
    - 	echo example | git hash-object -t $t --literally --stdin
    +@@ t/t1007-hash-object.sh: test_expect_success '--stdin outside of repository (uses SHA-1)' '
    + 	test_cmp expect actual
      '
      
     -test_expect_failure EXPENSIVE,SIZE_T_IS_64BIT,!LONG_IS_64BIT \
  • 73: 86e3fe3 = 74: 3c7b3ee hash-object --stdin: verify that it works with >4GB/LLP64

  • 74: 088db10 = 75: 3c7ce04 hash-object: add another >4GB/LLP64 test case

  • 76: 8afd3ea = 76: e15e691 setup: properly use "%(prefix)/" when in WSL

  • 77: 2763273 = 77: d366f34 hash-object: add a >4GB/LLP64 test case using filtered input

  • 78: 256cced = 78: fdcbfed compat/mingw.c: do not warn when failing to get owner

  • 79: ffdc0b6 = 79: 9f4937e mingw: $env:TERM="xterm-256color" for newer OSes

  • 81: b440a2b = 80: 3cfb590 vcxproj: allow building with NO_PERL again

  • 82: 8aeadd0 = 81: 671c141 vcxproj: require C11

  • 83: 6d8873f = 82: 22cdab4 vcxproj: ignore the -pedantic option

  • 85: 58aed3c = 83: 2f3699d vcxproj: include reftable when committing .vcxproj files

  • 87: 9dbe315 = 84: 3ca5c9d vcxproj: handle libreftable_test, too

  • 88: 8f90c6f = 85: 105dade vcxproj: avoid escaping double quotes in the defines

  • 89: 83caa43 = 86: e3f1e47 ci: adjust Azure Pipeline for runs_on_pool

  • 90: 08781b4 = 87: 1aca19c ci: stop linking the prove cache

  • 91: b0997e6 = 88: 7f39a93 ci: reinstate Azure Pipelines support

  • 92: 9e056f2 = 89: 4ca2723 azure-pipeline: drop the GETTEXT_POISON job

  • 93: 3a249a9 = 90: 7b655db azure-pipeline: stop hard-coding apt-get calls

  • 94: 80412d9 = 91: 90e897c azure-pipeline: drop the code to write to/read from a file share

  • 80: 29fbe6d = 92: bb5cf06 winansi: check result and Buffer before using Name

  • 95: 6c9e236 = 93: ac8583e azure-pipeline: use partial clone/parallel checkout to initialize minimal-sdk

  • 97: ea13b95 = 94: 9d1bd22 bswap.h: add support for built-in bswap functions

  • 96: 92afbc0 = 95: cf38b3a azure-pipeline: downcase the job name of the Linux32 job

  • 101: d7d0b29 = 96: ed563a6 config.mak.uname: add support for clangarm64

  • 98: fa56bf7 = 97: 8b4bf5f MinGW: link as terminal server aware

  • 99: e9152ac = 98: fc07bd0 azure-pipeline: run static-analysis on jammy

  • 100: 08f8722 = 99: 9bc98b2 Fix Windows version resources

  • 102: 1f5d277 = 100: 578a190 ci: create clangarm64-build.yml

  • 103: 3a200f2 = 101: a078d6c status: fix for old-style submodules with commondir

  • 104: bb6b77d = 102: 584c68a windows: skip linking git-<command> for built-ins

  • 105: c68b111 = 103: 540775a windows: fix Repository>Explore Working Copy

  • 106: e2a86ce = 104: 0ef88c8 http: optionally load libcurl lazily

  • 107: 3c74c0e = 105: 06b7556 http: support lazy-loading libcurl also on Windows

  • 108: b7f7f35 = 106: 317bc19 http: when loading libcurl lazily, allow for multiple SSL backends

  • 109: 3a63706 = 107: 8c624a1 mingw: do load libcurl dynamically by default

  • 110: de8076b = 108: 6b82cdf Add a GitHub workflow to verify that Git/Scalar work in Nano Server

  • 112: 0e12d73 = 109: b36763e win32: use native ANSI sequence processing, if possible

  • 113: 3fdb136 = 110: 9cb98e1 git.rc: include winuser.h

  • 114: 80c092b = 111: 12dc571 build(deps): bump microsoft/setup-msbuild from 1 to 2

  • 115: d31fe08 = 112: 59514d2 common-main.c: fflush stdout buffer upon exit

  • 84: 51a0924 ! 113: 94b60e9 Add config option windows.appendAtomically

    @@ Documentation/config/windows.txt (new)
     +	set it false to turn it off.
     
      ## compat/mingw.c ##
    +@@
    ++#define USE_THE_REPOSITORY_VARIABLE
    + #include "../git-compat-util.h"
    + #include "win32.h"
    + #include <aclapi.h>
     @@
      #include "gettext.h"
      #define SECURITY_WIN32
  • 86: 45dfdf1 = 114: 406afe5 mingw: change core.fsyncObjectFiles = 1 by default

  • 111: 6d4aac9 = 115: d33714f mingw: suggest windows.appendAtomically in more cases

  • 234: 7f8c443 = 116: 907ec73 t5601/t7406(mingw): do run tests with symlink support

  • 235: a74a04f = 117: e36580d win32: ensure that localtime_r() is declared even in i686 builds

  • 238: a4a94c2 = 118: 2a5b836 Fallback to AppData if XDG_CONFIG_HOME is unset

  • 239: 3324d3b = 119: 46d14a6 run-command: be helpful with Git LFS fails on Windows 7

  • -: ------------ > 120: 18b605d cmake: fix build of t-oidtree

  • 116: 0c4d990 = 121: 691eb43 Win32: make FILETIME conversion functions public

  • 117: 2a43ceb = 122: 018bf86 Win32: dirent.c: Move opendir down

  • 118: ca8ae34 = 123: 6dc619e mingw: make the dirent implementation pluggable

  • 119: bf09e51 = 124: ecfcb3f Win32: make the lstat implementation pluggable

  • 120: 988ea3c = 125: 9b7f879 mingw: add infrastructure for read-only file system level caches

  • 121: 5c7439c = 126: fa0c711 mingw: add a cache below mingw's lstat and dirent implementations

  • 122: 24d9b52 = 127: b46ee27 fscache: load directories only once

  • 123: 50007cd = 128: b567155 fscache: add key for GIT_TRACE_FSCACHE

  • 124: c4eaf36 = 129: fba2496 fscache: remember not-found directories

  • 125: 392749f = 130: 1953499 fscache: add a test for the dir-not-found optimization

  • 126: 410acbf ! 131: f49e942 add: use preload-index and fscache for performance

    @@ Commit message
     
      ## builtin/add.c ##
     @@ builtin/add.c: int cmd_add(int argc, const char **argv, const char *prefix)
    - 	die_in_unpopulated_submodule(&the_index, prefix);
    - 	die_path_inside_submodule(&the_index, &pathspec);
    + 	die_in_unpopulated_submodule(the_repository->index, prefix);
    + 	die_path_inside_submodule(the_repository->index, &pathspec);
      
     +	enable_fscache(1);
     +	/* We do not really re-read the index but update the up-to-date flags */
    -+	preload_index(&the_index, &pathspec, 0);
    ++	preload_index(the_repository->index, &pathspec, 0);
     +
      	if (add_new_files) {
      		int baselen;
  • 127: 3cfd9e2 = 132: d3c4d30 dir.c: make add_excludes aware of fscache during status

  • 128: b278999 = 133: c0e1534 fscache: make fscache_enabled() public

  • 129: b7d5acc = 134: 98b7d33 dir.c: regression fix for add_excludes with fscache

  • 130: 527bd69 = 135: 8d36ca9 fetch-pack.c: enable fscache for stats under .git/objects

  • 131: a7255cf ! 136: d18a16b checkout.c: enable fscache for checkout again

    @@ builtin/checkout.c: static int checkout_worktree(const struct checkout_opts *opt
      		init_parallel_checkout();
      
     +	enable_fscache(1);
    - 	for (pos = 0; pos < the_index.cache_nr; pos++) {
    - 		struct cache_entry *ce = the_index.cache[pos];
    + 	for (pos = 0; pos < the_repository->index->cache_nr; pos++) {
    + 		struct cache_entry *ce = the_repository->index->cache[pos];
      		if (ce->ce_flags & CE_MATCHED) {
     @@ builtin/checkout.c: static int checkout_worktree(const struct checkout_opts *opts,
      		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
      					      NULL, NULL);
      	mem_pool_discard(&ce_mem_pool, should_validate_cache_entries());
     +	enable_fscache(0);
    - 	remove_marked_cache_entries(&the_index, 1);
    + 	remove_marked_cache_entries(the_repository->index, 1);
      	remove_scheduled_dirs();
      	errs |= finish_delayed_checkout(&state, opts->show_progress);
     
  • 132: 4dd09d1 = 137: 6d59d63 Enable the filesystem cache (fscache) in refresh_index().

  • 133: 4a9f7dc = 138: e0c4eb3 fscache: use FindFirstFileExW to avoid retrieving the short name

  • 134: b063006 = 139: 4232b4c status: disable and free fscache at the end of the status command

  • 135: a028a14 = 140: f1600f3 fscache: add GIT_TEST_FSCACHE support

  • 136: 7686bc6 = 141: 31dcfeb fscache: add fscache hit statistics

  • 137: 38b2842 = 142: f8d96ca mem_pool: add GIT_TRACE_MEMPOOL support

  • 138: 18795f2 ! 143: 7238952 fscache: fscache takes an initial size

    @@ Commit message
     
      ## builtin/add.c ##
     @@ builtin/add.c: int cmd_add(int argc, const char **argv, const char *prefix)
    - 	die_in_unpopulated_submodule(&the_index, prefix);
    - 	die_path_inside_submodule(&the_index, &pathspec);
    + 	die_in_unpopulated_submodule(the_repository->index, prefix);
    + 	die_path_inside_submodule(the_repository->index, &pathspec);
      
     -	enable_fscache(1);
     +	enable_fscache(0);
      	/* We do not really re-read the index but update the up-to-date flags */
    - 	preload_index(&the_index, &pathspec, 0);
    + 	preload_index(the_repository->index, &pathspec, 0);
      
     
      ## builtin/checkout.c ##
    @@ builtin/checkout.c: static int checkout_worktree(const struct checkout_opts *opt
      		init_parallel_checkout();
      
     -	enable_fscache(1);
    -+	enable_fscache(the_index.cache_nr);
    - 	for (pos = 0; pos < the_index.cache_nr; pos++) {
    - 		struct cache_entry *ce = the_index.cache[pos];
    ++	enable_fscache(the_repository->index->cache_nr);
    + 	for (pos = 0; pos < the_repository->index->cache_nr; pos++) {
    + 		struct cache_entry *ce = the_repository->index->cache[pos];
      		if (ce->ce_flags & CE_MATCHED) {
     @@ builtin/checkout.c: static int checkout_worktree(const struct checkout_opts *opts,
      		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
    @@ builtin/checkout.c: static int checkout_worktree(const struct checkout_opts *opt
      	mem_pool_discard(&ce_mem_pool, should_validate_cache_entries());
     -	enable_fscache(0);
     +	disable_fscache();
    - 	remove_marked_cache_entries(&the_index, 1);
    + 	remove_marked_cache_entries(the_repository->index, 1);
      	remove_scheduled_dirs();
      	errs |= finish_delayed_checkout(&state, opts->show_progress);
     
  • 139: b4d0059 = 144: ff7d11e fscache: update fscache to be thread specific instead of global

  • 140: 4dc702e = 145: d70ee3e fscache: teach fscache to use mempool

  • 141: 67f924c = 146: bbaa835 fscache: make fscache_enable() thread safe

  • 142: 7060ba9 = 147: f9f1c11 fscache: teach fscache to use NtQueryDirectoryFile

  • 143: 6fb2cde = 148: 1bc1173 unpack-trees: enable fscache for sparse-checkout

  • 144: c538ddf = 149: 51589d8 fscache: remember the reparse tag for each entry

  • 145: ae4fc8e = 150: 9617e3c git-gui: provide question helper for retry fallback on Windows

  • 146: 45a8200 = 151: 4dca0a2 fscache: implement an FSCache-aware is_mount_point()

  • 147: ea7033f = 152: 193baf6 git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

  • 148: 51a7b4d ! 153: 7d35760 clean: make use of FSCache

    @@ builtin/clean.c: int cmd_clean(int argc, const char **argv, const char *prefix)
      
      	if (repo_read_index(the_repository) < 0)
      		die(_("index file corrupt"));
    -+	enable_fscache(the_index.cache_nr);
    ++	enable_fscache(the_repository->index->cache_nr);
      
      	pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
      	for (i = 0; i < exclude_list.nr; i++)
  • 149: 6e3ad03 = 154: 02f6ae8 gitk: Unicode file name support

  • 150: 36fb936 = 155: dd06904 git-gui--askyesno: fix funny text wrapping

  • 151: 4d1ddf3 = 156: a2cadcb gitk: Use an external icon file on Windows

  • 152: 9935b4a = 157: 4d0a0a7 git-gui--askyesno: allow overriding the window title

  • 153: a35c841 = 158: adf1d89 gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6

  • 154: 849a213 = 159: 8c02cbb git-gui--askyesno (mingw): use Git for Windows' icon, if available

  • 155: ad47ade = 160: 1f75d11 gitk: make the "list references" default window width wider

  • 156: 08a4b33 = 161: 6d57a51 pack-objects (mingw): demonstrate a segmentation fault with large deltas

  • 157: e4cccd1 = 162: beca37c mingw: support long paths

  • 158: 5dd339c = 163: c60f116 Win32: fix 'lstat("dir/")' with long paths

  • 159: 8af3c63 = 164: 367b7ac win32(long path support): leave drive-less absolute paths intact

  • 162: 9185194 = 165: 9c15e7b mingw: Support git_terminal_prompt with more terminals

  • 163: fc1bece = 166: 96f7208 compat/terminal.c: only use the Windows console if bash 'read -r' fails

  • 164: e005fb8 = 167: cd8d6b6 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

  • 165: ba2744c = 168: e53d026 Unbreak interactive GPG prompt upon signing

  • 166: 1bb4f92 = 169: 6b3d624 strbuf_readlink: don't call readlink twice if hint is the exact link size

  • 167: a0f945b = 170: 9407e23 strbuf_readlink: support link targets that exceed PATH_MAX

  • 168: 9819207 = 171: 0bd7c21 lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

  • 169: 211bead = 172: 9f3d0bd Win32: don't call GetFileAttributes twice in mingw_lstat()

  • 170: 713ddea = 173: 4dbf380 Win32: implement stat() with symlink support

  • 171: deccb41 = 174: 4d4e572 Win32: remove separate do_lstat() function

  • 160: 7429b6a = 175: c92990f compat/fsmonitor/fsm-*-win32: support long paths

  • 161: 2caadef = 176: cf1ad67 clean: suggest using core.longPaths if paths are too long to remove

  • 172: d42a196 = 177: be743cb Win32: let mingw_lstat() error early upon problems with reparse points

  • 173: 57875ce = 178: a151692 mingw: teach fscache and dirent about symlinks

  • 174: d21f319 = 179: 3b8188d Win32: lstat(): return adequate stat.st_size for symlinks

  • 175: 1bb95f4 = 180: f4a926e Win32: factor out retry logic

  • 176: c541060 = 181: 8a49696 Win32: change default of 'core.symlinks' to false

  • 177: 36a53db = 182: 770dbc3 Win32: add symlink-specific error codes

  • 178: 8af0aae = 183: 3e8d847 Win32: mingw_unlink: support symlinks to directories

  • 179: 76a29eb = 184: c9180fe Win32: mingw_rename: support renaming symlinks

  • 180: 3eef8c8 = 185: d02b989 Win32: mingw_chdir: change to symlink-resolved directory

  • 181: 614116c = 186: 25aa677 Win32: implement readlink()

  • 182: 9135f9b = 187: 632f530 mingw: lstat: compute correct size for symlinks

  • 183: 36de7f5 = 188: 87d8912 Win32: implement basic symlink() functionality (file symlinks only)

  • 184: b6ae9a1 = 189: 6201b76 Win32: symlink: add support for symlinks to directories

  • 185: 2dc52fa = 190: a12ceba mingw: try to create symlinks without elevated permissions

  • 186: 162d9ba = 191: 387565c mingw: emulate stat() a little more faithfully

  • 187: 9e7788a = 192: be9303f mingw: special-case index entries for symlinks with buggy size

  • 192: 0d387c8 = 193: 22a3d60 Win32: symlink: move phantom symlink creation to a separate function

  • 193: 53b0ad0 = 194: 4ee0b31 Introduce helper to create symlinks that knows about index_state

  • 194: 310f4b7 = 195: 7fe1056 mingw: allow to specify the symlink type in .gitattributes

  • 195: ee6a445 = 196: bc5aecf Win32: symlink: add test for symlink attribute

  • 197: e804203 = 197: 90af1a4 mingw: explicitly specify with which cmd to prefix the cmdline

  • 188: ecb012a ! 198: 0ef2f1c mingw: introduce code to detect whether we're inside a Windows container

    @@ Commit message
     
      ## compat/mingw.c ##
     @@ compat/mingw.c: int mingw_have_unix_sockets(void)
    - 	}
      	return ret;
      }
    + #endif
     +
     +/*
     + * Based on https://stackoverflow.com/questions/43002803
  • 198: d59aca0 = 199: e3ec150 mingw: when path_lookup() failed, try BusyBox

  • 189: 8782e01 = 200: 3c95135 mingw: when running in a Windows container, try to rename() harder

  • 199: 6c343f9 = 201: d95a157 test-lib: avoid unnecessary Perl invocation

  • 190: 1c116c6 = 202: 8d5869b mingw: move the file_attr_to_st_mode() function definition

  • 200: faeaf41 = 203: 3d2d68a test-tool: learn to act as a drop-in replacement for iconv

  • 191: f265297 = 204: c9aee6d mingw: Windows Docker volumes are not symbolic links

  • 201: af2e8f8 = 205: 4651b3d tests(mingw): if iconv is unavailable, use test-helper --iconv

  • 196: 0e9b96f = 206: 4b071ed mingw: work around rename() failing on a read-only file

  • 202: bd96a5c = 207: 168b479 gitattributes: mark .png files as binary

  • 203: ca44def = 208: c4b6184 tests: move test PNGs into t/lib-diff/

  • 204: 77cafa7 = 209: b5b33c1 tests: only override sort & find if there are usable ones in /usr/bin/

  • 205: 1885bf8 = 210: c3bfaf3 tests: use the correct path separator with BusyBox

  • 206: c32fa77 = 211: 186f9ff mingw: only use Bash-ism builtin pwd -W when available

  • 207: ca7b4a6 = 212: 71e6861 tests (mingw): remove Bash-specific pwd option

  • 208: 4db4c85 = 213: 9d6c96f test-lib: add BUSYBOX prerequisite

  • 209: b12d52b = 214: 80d33b6 t5003: use binary file from t/lib-diff/

  • 210: 7d531d5 = 215: ab5b9d1 t5532: workaround for BusyBox on Windows

  • 211: 380d54b = 216: 3c059e3 t5605: special-case hardlink test for BusyBox-w32

  • 212: cc94578 = 217: c5aa28a t5813: allow for $PWD to be a Windows path

  • 213: eb7ee49 = 218: 569f680 t9200: skip tests when $PWD contains a colon

  • 214: 6609cf0 = 219: b98ca57 mingw: add a Makefile target to copy test artifacts

  • 216: 423488e = 220: 9d056fa mingw: kill child processes in a gentler way

  • 217: 6e750cd = 221: 372373f mingw: do not call xutftowcs_path in mingw_mktemp

  • 215: 42300f0 ! 222: 6240365 mingw: optionally enable wsl compability file mode bits

    @@ compat/win32/fscache.c: static struct fsentry *fseentry_create_entry(struct fsca
     
      ## compat/win32/wsl.c (new) ##
     @@
    ++#define USE_THE_REPOSITORY_VARIABLE
     +#include "../../git-compat-util.h"
     +#include "../win32.h"
     +#include "../../repository.h"
  • 218: 9b77bf3 = 223: c769b84 mingw: really handle SIGINT

  • 219: 82031c0 = 224: 0bb4736 Partially un-revert "editor: save and reset terminal after calling EDITOR"

  • 224: cc6b49d = 225: af7fa6b Describe Git for Windows' architecture [no ci]

  • 225: a4a7bce = 226: b7d7731 Modify the Code of Conduct for Git for Windows

  • 226: 23ef491 = 227: d09e406 CONTRIBUTING.md: add guide for first-time contributors

  • 227: 4b77f03 = 228: b4e02b9 README.md: Add a Windows-specific preamble

  • 228: 19c7432 = 229: 4b7e1f9 Add an issue template

  • 229: 93306bf = 230: 01f7a13 Modify the GitHub Pull Request template (to reflect Git for Windows)

  • 230: d723dac = 231: 4890b63 .github: Add configuration for the Sentiment Bot

  • 220: 4987066 ! 232: 323134e Add a GitHub workflow to monitor component updates

    @@ .github/workflows/monitor-components.yml (new)
     +            feed: https://github.com/PCRE2Project/pcre2/tags.atom
     +          - label: mingw-w64-llvm
     +            feed: https://github.com/msys2/MINGW-packages/commits/master/mingw-w64-llvm.atom
    ++          - label: innosetup
    ++            feed: https://github.com/jrsoftware/issrc/tags.atom
     +      fail-fast: false
     +    steps:
     +      - uses: git-for-windows/rss-to-issues@v0
  • 231: 07098b4 = 233: 5a292d5 Document how $HOME is set on Windows

  • 221: b36f9e9 = 234: a49b209 reset: reinstate support for the deprecated --stdin option

  • 222: 7a8147e ! 235: 8d0b6cc fsmonitor: reintroduce core.useBuiltinFSMonitor

    @@ fsmonitor-settings.c: static void lookup_fsmonitor_settings(struct repository *r
      		break;
      
      	case -1: /* config value set to an arbitrary string */
    --		if (repo_config_get_pathname(r, "core.fsmonitor", &const_str))
    +-		if (repo_config_get_pathname(r, "core.fsmonitor", &to_free))
     -			return; /* should not happen */
     +		if (check_deprecated_builtin_config(r) ||
    -+		    repo_config_get_pathname(r, "core.fsmonitor", &const_str))
    ++		    repo_config_get_pathname(r, "core.fsmonitor", &to_free))
     +			return;
    + 		const_str = to_free;
      		break;
      
    - 	default: /* should not happen */
  • 223: 7d09408 = 236: 07fc800 dependabot: help keeping GitHub Actions versions up to date

  • 232: ce0413b = 237: 7c314ef SECURITY.md: document Git for Windows' policies

  • 233: 855e15c (upstream: f01301a) < -: ------------ compat/regex: fix argument order to calloc(3)

  • 236: 26d6126 (upstream: 3c295c8) < -: ------------ mingw: drop bogus (and unneeded) declaration of _pgmptr

  • 237: 833fe3a < -: ------------ fixup! Add a GitHub workflow to monitor component updates

This PR addresses #5055.

dscho and others added 30 commits July 12, 2024 21:48
Since ef8a6c6 (reftable: utility functions, 2021-10-07) we not only
have a libreftable, but also a libreftable_test.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Visual Studio 2022 does not like that at all.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These refactorings are really gifts that keep on giving.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
It is not useful because we do not have any persisted directory anymore,
not since dropping our Travis CI support.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
... so that we can test a MinGit backport in a private repository (with
GitHub Actions, minutes and parallel jobs are limited way more than with
Azure Pipelines in private repositories).

In this commit, we reinstate the exact version of `azure-pipelines.yml`
as 6081d38 (ci: retire the Azure Pipelines definition, 2020-04-11)
deleted.

Naturally, many adjustments are required to make it work again. Some of
the changes are actually outside of that file (such as the
`runs_on_pool` changes that are needed in the Azure Pipelines part of
`ci/lib.sh`) and they were made in the commits leading up to this here
commit.

However, other adjustments are required in the `azure-pipelines.yml`
file itself, and for ease of review (read: to build confidence in those
changes) they will be made in subsequent, individual commits that
explain the intent, context, implementation and justification like every
good commit message should do.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is a follow-up to 6c280b4 (ci: remove GETTEXT_POISON jobs,
2021-01-20) after reinstating the Azure Pipeline.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We have `ci/install-dependencies.sh` for that. Incidentally, this avoids
the following error in the linux-* jobs:

    The following packages have unmet dependencies:
    git-email : Depends: git (< 1:2.25.1-.) but 1:2.35.1-0ppa1~ubuntu20.04.1 is to be installed
	  Recommends: libemail-valid-perl but it is not going to be installed

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
We haven't used this feature in ages, we don't actually need to.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
NtQueryObject under Wine can return a success but fill out no name.
In those situations, Wine will set Buffer to NULL, and set result to
the sizeof(OBJECT_NAME_INFORMATION).

Running a command such as

echo "$(git.exe --version 2>/dev/null)"

will crash due to a NULL pointer dereference when the code attempts to
null terminate the buffer, although, weirdly, removing the subshell or
redirecting stdout to a file will not trigger the crash.

Code has been added to also check Buffer and Length to ensure the check
is as robust as possible due to the current behavior being fragile at
best, and could potentially change in the future

This code is based on the behavior of NtQueryObject under wine and
reactos.

Signed-off-by: Christopher Degawa <ccom@randomderp.com>
…imal-sdk

The Azure Pipeline `git-sdk-64-minimal` was retired...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
These many refactorings in Git sure are gifts that keep on giving.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
CLANGARM64 is a relatively new MSYSTEM added by the MSYS2 team. In order
to have Git build correctly for this platform, let's add some
configuration for it to config.mak.uname.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
This is inspired by d051ed7 (.github/workflows/main.yml: run
static-analysis on bionic, 2021-02-08) and by ef46584 (ci: update
'static-analysis' to Ubuntu 22.04, 2022-08-23), adapted to the Azure
Pipeline.

When Azure Pipelines' build agents transitioned 'ubuntu-latest' from
18.04 to 20.04, it broke our `static-analysis` job, since Coccinelle
was not madeavailable on Ubuntu focal (it is only available in the
universe suite).

This is not an issue with Ubuntu 22.04, but we will only know whether it
is an issue with 24.04 when _that_ comes out. So let's play it safe and
pin the `static_analysis` job to the latest Ubuntu version that we know
to offer a working Coccinelle package.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
Newer compiler versions, like GCC 10 and Clang 12, have built-in
functions for bswap32 and bswap64. This comes in handy, for example,
when targeting CLANGARM64 on Windows, which would not be supported
without this logic.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
No GitHub-hosted ARM64 runners are available at the moment of writing,
but folks can leverage self-hosted runners of this architecture. This CI
pipeline comes in handy for forks of the git-for-windows/git project
that have such runners available. The pipeline can be kicked off
manually through a workflow_dispatch.

Signed-off-by: Dennis Ameling <dennis@dennisameling.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>
It is merely a historical wart that, say, `git-commit` exists in the
`libexec/git-core/` directory, a tribute to the original idea to let Git
be essentially a bunch of Unix shell scripts revolving around very few
"plumbing" (AKA low-level) commands.

Git has evolved a lot from there. These days, most of Git's
functionality is contained within the `git` executable, in the form of
"built-in" commands.

To accommodate for scripts that use the "dashed" form of Git commands,
even today, Git provides hard-links that make the `git` executable
available as, say, `git-commit`, just in case that an old script has not
been updated to invoke `git commit`.

Those hard-links do not come cheap: they take about half a minute for
every build of Git on Windows, they are mistaken for taking up huge
amounts of space by some Windows Explorer versions that do not
understand hard-links, and therefore many a "bug" report had to be
addressed.

The "dashed form" has been officially deprecated in Git version 1.5.4,
which was released on February 2nd, 2008, i.e. a very long time ago.
This deprecation was never finalized by skipping these hard-links, but
we can start the process now, in Git for Windows.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Since Git v2.39.1, we are a bit more stringent in searching the PATH. In
particular, we specifically require the `.exe` suffix.

However, the `Repository>Explore Working Copy` command asks for
`explorer.exe` to be found on the `PATH`, which _already_ has that
suffix.

Let's unstartle the PATH-finding logic about this scenario.

This fixes git-for-windows#4356

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This compile-time option allows to ask Git to load libcurl dynamically
at runtime.

Together with a follow-up patch that optionally overrides the file name
depending on the `http.sslBackend` setting, this kicks open the door for
installing multiple libcurl flavors side by side, and load the one
corresponding to the (runtime-)configured SSL/TLS backend.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This implements the Windows-specific support code, because everything is
slightly different on Windows, even loading shared libraries.

Note: I specifically do _not_ use the code from
`compat/win32/lazyload.h` here because that code is optimized for
loading individual functions from various system DLLs, while we
specifically want to load _many_ functions from _one_ DLL here, and
distinctly not a system DLL (we expect libcurl to be located outside
`C:\Windows\system32`, something `INIT_PROC_ADDR` refuses to work with).
Also, the `curl_easy_getinfo()`/`curl_easy_setopt()` functions are
declared as vararg functions, which `lazyload.h` cannot handle. Finally,
we are about to optionally override the exact file name that is to be
loaded, which is a goal contrary to `lazyload.h`'s design.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The previous commits introduced a compile-time option to load libcurl
lazily, but it uses the hard-coded name "libcurl-4.dll" (or equivalent
on platforms other than Windows).

To allow for installing multiple libcurl flavors side by side, where
each supports one specific SSL/TLS backend, let's first look whether
`libcurl-<backend>-4.dll` exists, and only use `libcurl-4.dll` as a fall
back.

That will allow us to ship with a libcurl by default that only supports
the Secure Channel backend for the `https://` protocol. This libcurl
won't suffer from any dependency problem when upgrading OpenSSL to a new
major version (which will change the DLL name, and hence break every
program and library that depends on it).

This is crucial because Git for Windows relies on libcurl to keep
working when building and deploying a new OpenSSL package because that
library is used by `git fetch` and `git clone`.

Note that this feature is by no means specific to Windows. On Ubuntu,
for example, a `git` built using `LAZY_LOAD_LIBCURL` will use
`libcurl.so.4` for `http.sslbackend=openssl` and `libcurl-gnutls.so.4`
for `http.sslbackend=gnutls`.

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>
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>
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>
Bumps [microsoft/setup-msbuild](https://github.com/microsoft/setup-msbuild) from 1 to 2.
- [Release notes](https://github.com/microsoft/setup-msbuild/releases)
- [Changelog](https://github.com/microsoft/setup-msbuild/blob/main/building-release.md)
- [Commits](microsoft/setup-msbuild@v1...v2)

---
updated-dependencies:
- dependency-name: microsoft/setup-msbuild
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
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>
These fixes were necessary for Sverre Rabbelier's remote-hg to work,
but for some magic reason they are not necessary for the current
remote-hg. Makes you wonder how that one gets away with it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho and others added 22 commits July 12, 2024 22:27
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>
This is the recommended way on GitHub to describe policies revolving around
security issues and about supported versions.

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

clean: suggest using `core.longPaths` if paths are too long to remove
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>
…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 self-assigned this Jul 12, 2024
@dscho dscho added this to the Next release milestone Jul 12, 2024
@dscho dscho linked an issue Jul 12, 2024 that may be closed by this pull request
@dscho
Copy link
Member Author

dscho commented Jul 12, 2024

/git-artifacts

The tag-git workflow run was started

The git-artifacts-x86_64 workflow run was started.
The git-artifacts-i686 workflow run was started.

@dscho
Copy link
Member Author

dscho commented Jul 15, 2024

/release

The release-git workflow run was started

@gitforwindowshelper gitforwindowshelper bot merged commit b105301 into git-for-windows:main Jul 15, 2024
34 of 35 checks passed
@dscho dscho deleted the rebase-to-v2.46.0-rc0 branch July 15, 2024 06:45
@dscho dscho changed the title Rebase to v2.46.0 rc0 Rebase to v2.46.0-rc0 Jul 15, 2024
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.46.0-rc0