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.38.0-rc1 #4032

Merged
merged 401 commits into from Sep 22, 2022
Merged

Rebase to v2.38.0-rc1 #4032

merged 401 commits into from Sep 22, 2022

Conversation

dscho
Copy link
Member

@dscho dscho commented Sep 22, 2022

Range-diff to current `main`
  • 1: e1c540c = 1: e945191 t9350: point out that refs are not updated correctly

  • 2: 8082fe4 = 2: 751fa71 transport-helper: add trailing --

  • 3: 481d838 = 3: aca341d remote-helper: check helper status after import/export

  • 4: 6671718 = 4: b8dddd8 mingw: demonstrate a problem with certain absolute paths

  • 7: 59cdb66 = 5: 6a38c9f gitk: prevent overly long command lines

  • 9: b332c56 = 6: cae3981 clean: do not traverse mount points

  • 10: 7b93cc2 = 7: 033c693 mingw: include the Python parts in the build

  • 5: 607c337 = 8: a19f843 Always auto-gc after calling a fast-import transport

  • 6: d840d0d = 9: e479420 mingw: allow absolute paths without drive prefix

  • 8: 5e0e991 = 10: 991a895 mingw: change core.fsyncObjectFiles = 1 by default

  • 11: 63dab35 = 11: b3b2ae8 gitk: Escape file paths before piping to git log

  • 12: 9867f31 = 12: 31df13d clean: remove mount points when possible

  • 13: 920138a = 13: 3b060e5 Config option to disable side-band-64k for transport

  • 14: 7a7dffa = 14: 6553219 mingw: make sure errno is set correctly when socket operations fail

  • 15: bac9575 = 15: 511d9f8 mingw: do resolve symlinks in getcwd()

  • 25: 12e0667 = 16: 026942a vcxproj: unclash project directories with build outputs

  • 17: 9b681be = 17: 7aded36 mingw: ensure valid CTYPE

  • 18: c041836 = 18: 26c1e40 mingw: demonstrate a git add issue with NTFS junctions

  • 26: fdb7550 = 19: ccfba34 t5505/t5516: allow running without .git/branches/ in the templates

  • 19: 1f39185 = 20: ed7747c mingw: allow git.exe to be used instead of the "Git wrapper"

  • 20: bb6f4fa = 21: 07f2f57 strbuf_realpath(): use platform-dependent API if available

  • 27: 2160fce = 22: 5dc23b0 t5505/t5516: fix white-space around redirectors

  • 21: faec88e = 23: 4a1dc44 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

  • 22: 1ecef8e = 24: 0e8c173 http: use new "best effort" strategy for Secure Channel revoke checking

  • 16: 8214a5c = 25: c592889 mingw: fix fatal error working on mapped network drives on Windows

  • 23: 2536656 = 26: 6b66bdd clink.pl: fix MSVC compile script to handle libcurl-d.lib

  • 24: 1ba1a9d = 27: d58838c mingw: implement a platform-specific strbuf_realpath()

  • 28: ad04f51 = 28: dffaaaf Allow add -p and add -i with a large number of files

  • 30: 7e5094e = 29: cdbebe0 git add -i: handle CR/LF line endings in the interactive input

  • 35: bda7bd9 = 30: f137062 commit: accept "scissors" with CR/LF line endings

  • 36: 1b23cfd = 31: 1ad2c90 t0014: fix indentation

  • 31: b21916e = 32: cce1b40 clink.pl: fix libexpatd.lib link error when using MSVC

  • 32: bf25f6b = 33: 20f062e Makefile: clean up .ilk files when MSVC=1

  • 33: c39dfee = 34: e13117d vcbuild: add support for compiling Windows resource files

  • 34: e45eb41 = 35: 8192ddf config.mak.uname: add git.rc to MSVC builds

  • 38: cbd7448 = 36: 1e122c3 clink.pl: ignore no-stack-protector arg on MSVC=1 builds

  • 39: a09a029 = 37: 0b1bee8 clink.pl: move default linker options for MSVC=1 builds

  • 41: a2758d0 = 38: 1f88d3d buildsystems: remove duplicate clause

  • 43: 653ef80 = 39: a81bcc8 vcxproj: handle resource files, too

  • 40: 35b4e38 = 40: fb835c4 vcpkg_install: detect lack of Git

  • 45: 99f2e86 = 41: 1abc867 vcxproj: ignore -fno-stack-protector and -fno-common

  • 42: ee5af34 = 42: d061df3 vcpkg_install: add comment regarding slow network connections

  • 47: ff4e2e1 = 43: dc954b3 vcxproj: handle GUI programs, too

  • 44: d565baa = 44: a1cb6f1 vcxproj: support building Windows/ARM64 binaries

  • 49: b8ae498 ! 45: 396c873 win32: add a helper to run git.exe without a foreground window

    @@ Makefile: clean: profile-clean coverage-clean cocciclean
      	$(RM) $(OBJECTS)
     +	$(RM) headless-git.o
      	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(REFTABLE_TEST_LIB)
    - 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
    + 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS)
      	$(RM) $(TEST_PROGRAMS)
     @@ Makefile: endif
      	$(RM) GIT-SCRIPT-DEFINES GIT-PERL-DEFINES GIT-PERL-HEADER GIT-PYTHON-VARS
  • 46: 2916679 = 46: fcf4e5f vcbuild: install ARM64 dependencies when building ARM64 binaries

  • 51: cddc674 = 47: 079b85a git maintenance: avoid console window in scheduled tasks on Windows

  • 37: 5314e08 = 48: cfbe185 git-gui: accommodate for intent-to-add files

  • 52: a597d7b = 49: c6ff951 Add a GitHub workflow to generate Git for Windows' Pacman package

  • 53: e17402f = 50: 5bfd37b git-artifacts: if GPG secrets are available, use them

  • 54: 1d2c687 = 51: 400f769 git-artifacts: also code-sign, if configured via the secrets

  • 55: eb56663 = 52: 217d7a4 git-artifacts: also build the installer

  • 56: 507caf6 = 53: 5012d57 git-artifacts: also build portable, mingit and mingit-busybox

  • 57: 286f370 = 54: 0f110f6 git-artifacts: also build 32-bit versions

  • 58: a62b7f9 = 55: 44ad606 git-artifacts: also build the nuget package

  • 59: 74d09dc = 56: e5c469b git-artifacts: allow restricting which artifacts are built

  • 60: 8550041 = 57: c7793b8 git-artifacts: allow specifying repo/ref via workflow_dispatch

  • 61: 4b51d6e = 58: f193e90 git-artifacts: cache the build-installers artifact

  • 62: 1ca5014 = 59: 9f8cc18 git-artifacts: use the cached build-installers instead of makepkg-git

  • 64: 68d7ae9 = 60: eff54b0 git-artifacts: add ARM64 artifacts

  • 67: 630d02d = 61: 5427059 git-artifacts(arm64): avoid hard-linking the dashed built-ins

  • 68: 4f1d1f9 = 62: 60208ad git-artifacts: use a narrower PATH

  • 48: f71b8f0 = 63: 45812f1 vcbuild: add an option to install individual 'features'

  • 69: d715db3 = 64: cefb9bf git-artifacts: fix BUILD_ONLY handling for ARM64

  • 50: 4cfc909 = 65: a6ab733 cmake: allow building for Windows/ARM64

  • 70: 862076b = 66: b6d1188 git-artifacts: extend the SKIP logic to handle pkg and build-arm64

  • 63: 7543e15 = 67: 651a629 ci(vs-build) also build Windows/ARM64 artifacts

  • 71: d54f001 = 68: 2e138eb git-artifacts: mark all inputs as "not required"

  • 65: 3d96f97 = 69: a2a4f8e Add schannel to curl installation

  • 72: c05801e = 70: 771153d git-artifacts(build-arm64): build artifacts using the intended Git revision

  • 66: 1188219 = 71: a8658bd git-artifacts: add workaround for GCM Core on ARM64

  • 73: a982171 = 72: 85c91bf cmake(): allow setting HOST_CPU for cross-compilation

  • 74: 62acf98 = 73: e0d8176 git-artifacts: use the setup-git-for-windows-sdk Action

  • 75: 488456a = 74: c9c8710 ci(): add HOST_CPU to CMake command

  • 81: f6f01bd = 75: 7f9f87f CMake: default Visual Studio generator has changed

  • 82: f7ca3c6 = 76: 6978229 .gitignore: add Visual Studio CMakeSetting.json file

  • 76: ea48d99 = 77: 534e67a subtree: update contrib/subtree test target

  • 84: 9dd28b0 = 78: 5e2b1f6 CMakeLists: add default "x64-windows" arch for Visual Studio

  • 85: 83aa608 = 79: d8f646d fsmonitor: reintroduce core.useBuiltinFSMonitor

  • 77: 7387a76 = 80: c1f85f3 ci(vs-build): download the vcpkg artifacts using a dedicated Action

  • 78: ff5e984 = 81: ffdce9b mingw: allow for longer paths in parse_interpreter()

  • 79: 45a5d78 = 82: af09265 compat/vcbuild: document preferred way to build in Visual Studio

  • 80: b5a014a = 83: 391b097 http: optionally send SSL client certificate

  • 87: 7e80060 = 84: 406cd1d ci: run contrib/subtree tests in CI builds

  • 88: 3d3f165 = 85: 49674f1 CMake: show Win32 and Generator_platform build-option values

  • 89: 0af57e9 = 86: 2f93a90 init: do parse all core.* settings early

  • 83: dc77415 = 87: 4b272bd hash-object: demonstrate a >4GB/LLP64 problem

  • 86: e9cbc5a = 88: 1ee67eb hash_object_file_literally(): use size_t

  • 95: 47742b8 = 89: 03936f2 vcxproj: allow building with NO_PERL again

  • 91: ee00326 = 90: 34b4f68 object-file.c: use size_t for header lengths

  • 96: 103c942 = 91: 005f80c vcxproj: require C11

  • 92: 3f2541e = 92: 334860c hash algorithms: use size_t for section lengths

  • 98: 9d8e328 = 93: 50bec54 vcxproj: ignore the -pedantic option

  • 93: d18a78b = 94: 026b8d3 hash-object --stdin: verify that it works with >4GB/LLP64

  • 104: ad6afeb = 95: 4160649 vcxproj: include reftable when committing .vcxproj files

  • 94: c4701dd = 96: 09c68e9 hash-object: add another >4GB/LLP64 test case

  • 97: c22d07e = 97: b126552 setup: properly use "%(prefix)/" when in WSL

  • 105: f6946cf = 98: 0f97491 vcxproj: handle libreftable_test, too

  • 90: 57a866b = 99: 6fcf6fc Enable the built-in FSMonitor as an experimental feature

  • 99: 561a5e8 = 100: 33a014d hash-object: add a >4GB/LLP64 test case using filtered input

  • 100: ac8105a = 101: ec68459 compat/mingw.c: do not warn when failing to get owner

  • 101: 439a8b2 = 102: c9a529c mingw: $env:TERM="xterm-256color" for newer OSes

  • 102: 47afddb = 103: f060165 winansi: check result and Buffer before using Name

  • 103: 0ba0416 = 104: 0fe2bc1 Add config option windows.appendAtomically

  • 106: fcb8aed = 105: 8ea3750 vcxproj: avoid escaping double quotes in the defines

  • 117: 825c77b = 106: 42e3768 win32/pthread: avoid name clashes with winpthread

  • 107: c9bfa3a = 107: 70cb56e ci: adjust Azure Pipeline for runs_on_pool

  • 118: 3bc8e61 = 108: 8b0c082 git-compat-util: avoid redeclaring _DEFAULT_SOURCE

  • 108: a379a40 = 109: f7d9c98 ci: stop linking the prove cache

  • 119: 85dfed2 = 110: 111e8ff Import the source code of mimalloc

  • 109: 8a3a771 = 111: 95435ff ci: reinstate Azure Pipelines support

  • 120: 34da9a7 = 112: 0495713 mimalloc: adjust for building inside Git

  • 110: fe20eb6 = 113: b0b1934 azure-pipeline: drop the GETTEXT_POISON job

  • 121: b13fd67 = 114: 0cf7358 mimalloc: avoid %z format

  • 111: b6aa24d = 115: 3f4dd05 azure-pipeline: stop hard-coding apt-get calls

  • 122: 44d01f4 = 116: 7c6d4ad mimalloc: avoid having to link to psapi just for mimalloc

  • 112: 9c44fa9 = 117: 8c69f10 azure-pipeline: drop the code to write to/read from a file share

  • 123: f930463 = 118: 64f09f3 mimalloc: avoid having to link to bcrypt just for mimalloc

  • 113: ac551bf = 119: 2a15ef6 azure-pipeline: use partial clone/parallel checkout to initialize minimal-sdk

  • 124: 314ace6 = 120: c5d12c1 mimalloc: offer a build-time option to enable it

  • 114: 38fc4d2 = 121: 2cb4e87 azure-pipeline: downcase the job name of the Linux32 job

  • 125: aa076e0 = 122: baf7a64 mimalloc: make MIMALLOC_SHOW_STATS work with redirected stderr

  • 115: 8079031 = 123: dd315da azure-pipeline: run static-analysis on bionic

  • 116: 9393f68 = 124: 6b3c69b MinGW: link as terminal server aware

  • 126: ff2ce66 = 125: 6076a6e mingw: use mimalloc

  • 156: 28f0304 = 126: ca5505d git-gui: provide question helper for retry fallback on Windows

  • 158: e68f005 = 127: 57cd3d8 git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

  • 162: 69ac28a = 128: 509b410 git-gui--askyesno: fix funny text wrapping

  • 159: 1bb10ea = 129: 4780a09 respect core.hooksPath, falling back to .git/hooks

  • 161: 1b3937c = 130: 98dc265 gitk: Unicode file name support

  • 163: d190d96 = 131: 402cfb1 gitk: Use an external icon file on Windows

  • 164: 5a0579f = 132: a4f0d2a git-gui--askyesno: allow overriding the window title

  • 165: c47f966 = 133: b34d25e gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6

  • 166: 3b82633 = 134: 9fa79fc git-gui--askyesno (mingw): use Git for Windows' icon, if available

  • 167: a826a55 = 135: 78632b6 gitk: make the "list references" default window width wider

  • 232: 16ba674 = 136: 677790f Modify the Code of Conduct for Git for Windows

  • 233: 4efcd53 = 137: a573830 CONTRIBUTING.md: add guide for first-time contributors

  • 234: 87de92c = 138: 66acd8b README.md: Add a Windows-specific preamble

  • 235: 5136963 = 139: cf303e2 Add an issue template

  • 236: 9d3de24 = 140: e53f1f8 Modify the GitHub Pull Request template (to reflect Git for Windows)

  • 237: b65196e = 141: 9e4f6ba .github: Add configuration for the Sentiment Bot

  • 241: 0c44887 = 142: ca7cd83 Document how $HOME is set on Windows

  • 238: cd39e48 = 143: 901f599 reset: reinstate support for the deprecated --stdin option

  • 239: bd909f5 = 144: ee532c7 mingw: deprecate old-style runtime-prefix handling in interpolate_path()

  • 240: d196ef3 = 145: 7dd3289 Add a GitHub workflow to monitor component updates

  • 242: 66ace5f = 146: 6c56325 SECURITY.md: document Git for Windows' policies

  • 29: 100a975 ! 147: ac40eb3 t3701: verify that we can add lots of files interactively

    @@ t/t3701-add-interactive.sh: test_expect_success 'checkout -p patch editing of ad
     +		git add -N $name &&
     +		y="${y}y$LF" &&
     +		i=$(($i+1)) ||
    -+		break
    ++		exit 1
     +	done &&
     +	echo "$y" | git add -p -- . &&
     +	git diff --cached >staged &&
  • 127: facf40a = 148: f2c74aa Win32: make FILETIME conversion functions public

  • 128: 055b028 = 149: 8c6f158 Win32: dirent.c: Move opendir down

  • 129: da9a2a8 = 150: 5220aea mingw: make the dirent implementation pluggable

  • 130: 6665f73 = 151: 7210ff7 Win32: make the lstat implementation pluggable

  • 131: 74d18a7 = 152: 6cdb2fb add infrastructure for read-only file system level caches

  • 132: c887104 = 153: 5dc079e mingw: add a cache below mingw's lstat and dirent implementations

  • 133: c38580c = 154: 0890b0a fscache: load directories only once

  • 134: 9f148f2 = 155: a8598ed fscache: add key for GIT_TRACE_FSCACHE

  • 135: 7fdc57e = 156: 2e26a6f fscache: remember not-found directories

  • 136: 455c2e3 ! 157: 0d766ed fscache: add a test for the dir-not-found optimization

    @@ t/t1090-sparse-checkout-scope.sh: test_expect_success 'in partial clone, sparse
     +		do
     +			sha1=$(echo $f | git hash-object -w --stdin) &&
     +			git update-index --add \
    -+				--cacheinfo 100644,$sha1,excluded/$f || break
    ++				--cacheinfo 100644,$sha1,excluded/$f || exit 1
     +		done &&
     +		test_tick &&
     +		git commit -m excluded &&
  • 137: 137482a = 158: fb506ce add: use preload-index and fscache for performance

  • 138: 47cf2b5 = 159: 74e7e79 dir.c: make add_excludes aware of fscache during status

  • 139: e98fd0c = 160: cffcb62 fscache: make fscache_enabled() public

  • 140: 6a42aa2 = 161: dd574be dir.c: regression fix for add_excludes with fscache

  • 141: 5fdfdf8 = 162: 81fc1c8 fetch-pack.c: enable fscache for stats under .git/objects

  • 142: 9bece8c = 163: 6265caf checkout.c: enable fscache for checkout again

  • 143: 8166572 = 164: a917ff9 Enable the filesystem cache (fscache) in refresh_index().

  • 144: fbd5b1c = 165: c5c3a85 fscache: use FindFirstFileExW to avoid retrieving the short name

  • 145: d1a82a9 = 166: 31f4a14 status: disable and free fscache at the end of the status command

  • 146: 98c2e04 = 167: 5e9d22b fscache: add GIT_TEST_FSCACHE support

  • 147: 9f00d95 = 168: 2096c0e fscache: add fscache hit statistics

  • 148: cc57cd2 = 169: 511e2cd mem_pool: add GIT_TRACE_MEMPOOL support

  • 149: 23cc27b = 170: f995134 fscache: fscache takes an initial size

  • 150: e7f9898 = 171: b62c18b fscache: update fscache to be thread specific instead of global

  • 151: c07d166 = 172: c4bb102 fscache: teach fscache to use mempool

  • 152: 7671b2e = 173: cd119f2 fscache: make fscache_enable() thread safe

  • 153: db7a4ec = 174: aadde92 fscache: teach fscache to use NtQueryDirectoryFile

  • 154: a5fddb7 = 175: 3ac93fc unpack-trees: enable fscache for sparse-checkout

  • 155: 2af243c = 176: c1014ad fscache: remember the reparse tag for each entry

  • 157: 66577d6 = 177: c4f9797 fscache: implement an FSCache-aware is_mount_point()

  • 160: abbb795 = 178: be9795a clean: make use of FSCache

  • 168: 8c3ddd3 = 179: 2c04911 pack-objects (mingw): demonstrate a segmentation fault with large deltas

  • 169: a5186c2 = 180: 40772e0 mingw: support long paths

  • 170: a4b1114 = 181: f391b19 Win32: fix 'lstat("dir/")' with long paths

  • 171: ae4e147 = 182: a28d904 mingw: ensure that core.longPaths is handled always

  • 173: e87a650 = 183: 3d9387a mingw: Support git_terminal_prompt with more terminals

  • 174: 9e64a6d = 184: 8c5823d compat/terminal.c: only use the Windows console if bash 'read -r' fails

  • 175: 4045d58 = 185: 26fa080 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

  • 176: 343cb04 = 186: 1100ffb Unbreak interactive GPG prompt upon signing

  • 177: d4afc7e = 187: fe95dea strbuf_readlink: don't call readlink twice if hint is the exact link size

  • 178: 84d1fc2 = 188: d925b68 strbuf_readlink: support link targets that exceed PATH_MAX

  • 179: 4df3457 = 189: 366cf5c lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

  • 181: 3be7cfb = 190: ae58428 Win32: don't call GetFileAttributes twice in mingw_lstat()

  • 172: b161856 = 191: d5ac68e compat/fsmonitor/fsm-*-win32: support long paths

  • 180: 0cb0c40 = 192: 6e09ae2 clean: suggest using core.longPaths if paths are too long to remove

  • 182: 486537a = 193: 5e0578d Win32: implement stat() with symlink support

  • 183: 9254a1d = 194: ae4e96b Win32: remove separate do_lstat() function

  • 184: 5a082f5 = 195: aa33f26 Win32: let mingw_lstat() error early upon problems with reparse points

  • 185: f299987 = 196: 0a17234 mingw: teach fscache and dirent about symlinks

  • 186: d29d78d = 197: c96e396 Win32: lstat(): return adequate stat.st_size for symlinks

  • 187: e8e77cb = 198: 1575448 Win32: factor out retry logic

  • 188: 2317280 = 199: a64ec30 Win32: change default of 'core.symlinks' to false

  • 189: 34e5622 = 200: 199b080 Win32: add symlink-specific error codes

  • 190: 6b018f7 = 201: 90bbb62 Win32: mingw_unlink: support symlinks to directories

  • 191: afd0b3b = 202: 8458d84 Win32: mingw_rename: support renaming symlinks

  • 192: 3b8e0db = 203: 89798ae Win32: mingw_chdir: change to symlink-resolved directory

  • 193: 10803a3 = 204: ed2b8c1 Win32: implement readlink()

  • 194: ecf2380 = 205: 628e191 mingw: lstat: compute correct size for symlinks

  • 195: 69973d1 = 206: 2fa7c31 Win32: implement basic symlink() functionality (file symlinks only)

  • 196: 1b17ac0 = 207: d25cf4e Win32: symlink: add support for symlinks to directories

  • 197: 5b31879 = 208: 348c78a mingw: try to create symlinks without elevated permissions

  • 198: 6511703 = 209: 5d11986 mingw: emulate stat() a little more faithfully

  • 199: 973fe3a = 210: cf74ed5 mingw: special-case index entries for symlinks with buggy size

  • 200: 9a62649 = 211: 65e654e mingw: introduce code to detect whether we're inside a Windows container

  • 203: b6ddca9 = 212: 2c12a23 Win32: symlink: move phantom symlink creation to a separate function

  • 201: 6b57168 = 213: 3e5a5c4 mingw: when running in a Windows container, try to rename() harder

  • 205: d72e07c = 214: 322fe4a Introduce helper to create symlinks that knows about index_state

  • 202: c32a4e7 = 215: 39c16ac mingw: move the file_attr_to_st_mode() function definition

  • 206: e109581 = 216: 32e946b mingw: allow to specify the symlink type in .gitattributes

  • 204: adda2a7 = 217: 7da6e7b mingw: Windows Docker volumes are not symbolic links

  • 207: a5b42ee = 218: 97088dd Win32: symlink: add test for symlink attribute

  • 208: 9b86c8e = 219: 469f0c6 mingw: explicitly specify with which cmd to prefix the cmdline

  • 209: c6bb0e6 = 220: 27ea878 mingw: when path_lookup() failed, try BusyBox

  • 210: 1543bd1 = 221: 950da0a test-lib: avoid unnecessary Perl invocation

  • 211: c8c6f5f = 222: 486da74 tests: replace mingw_test_cmp with a helper in C

  • 212: 90f9333 = 223: fa912e4 test-tool: learn to act as a drop-in replacement for iconv

  • 213: ac5e171 = 224: 1bd6e5c tests(mingw): if iconv is unavailable, use test-helper --iconv

  • 214: d8b4e96 = 225: 5c32e43 gitattributes: mark .png files as binary

  • 215: a879ff8 = 226: a3a4876 tests: move test PNGs into t/lib-diff/

  • 216: 14597eb = 227: ce25ea8 tests: only override sort & find if there are usable ones in /usr/bin/

  • 217: 8eb0287 = 228: 1264fff tests: use the correct path separator with BusyBox

  • 218: 8dad74f = 229: 11d64fa mingw: only use Bash-ism builtin pwd -W when available

  • 219: 8c27052 = 230: 874f370 tests (mingw): remove Bash-specific pwd option

  • 220: d43d800 = 231: 069e648 test-lib: add BUSYBOX prerequisite

  • 221: 74d4ef4 = 232: a1077e6 t0021: use Windows path when appropriate

  • 222: 4471a7a = 233: 1066699 t5003: use binary file from t/lib-diff/

  • 223: 7e12c02 = 234: 09a3d4c t5532: workaround for BusyBox on Windows

  • 224: a1fad28 = 235: fd2cce4 t5605: special-case hardlink test for BusyBox-w32

  • 225: f47e268 = 236: 9a89257 t5813: allow for $PWD to be a Windows path

  • 226: 6ca169d = 237: 7629ab1 t9200: skip tests when $PWD contains a colon

  • 228: 9c9c1da = 238: dea4755 mingw: kill child processes in a gentler way

  • 229: d9a4b91 = 239: 78d6d6f mingw: do not call xutftowcs_path in mingw_mktemp

  • 227: 1eec264 = 240: 493fb69 mingw: add a Makefile target to copy test artifacts

  • 230: 986684b = 241: 732efcf mingw: really handle SIGINT

  • 231: 18f6cc8 = 242: 9904679 Partially un-revert "editor: save and reset terminal after calling EDITOR"

Only two changes were necessary, to appease the new-and-improved chainlint.

dscho and others added 30 commits September 22, 2022 08:13
This simplifies the workflow dramatically, as well as accelerating it
because the Action recently learned to use the partial clone/parallel
checkout features of Git.

Note that we have to reinstate that `/usr/bin/git` hack (a shell script
that simply redirects to `/mingw64/bin/git.exe`) in the `pkg` job
manually, since we no longer cache the `build-installers` artifact
_after_ installing that hack in `bundle-artifacts`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
Correct some wording and inform users regarding the Visual Studio
changes (from V16.6) to the default generator.

Subsequent commits ensure that Git for Windows can be directly
opened in modern Visual Studio without needing special configuration
of the CMakeLists settings.

It appeares that internally Visual Studio creates it's own version of the
.sln file (etc.) for extension tools that expect them.

The large number of references below document the shifting of Visual Studio
default and CMake setting options.

refs: https://docs.microsoft.com/en-us/search/?scope=C%2B%2B&view=msvc-150&terms=Ninja

1. https://docs.microsoft.com/en-us/cpp/linux/cmake-linux-configure?view=msvc-160
(note the linux bit)
 "In Visual Studio 2019 version 16.6 or later ***, Ninja is the default
generator for configurations targeting a remote system or WSL. For more
information, see this post on the C++ Team Blog
[https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/].

For more information about these settings, see CMakeSettings.json reference
[https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160]."

2. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160
"CMake supports two files that allow users to specify common configure,
build, and test options and share them with others: CMakePresets.json
and CMakeUserPresets.json."

" Both files are supported in Visual Studio 2019 version 16.10 or later.
***"
3. https://devblogs.microsoft.com/cppblog/linux-development-with-visual-studio-first-class-support-for-gdbserver-improved-build-times-with-ninja-and-updates-to-the-connection-manager/
" Ninja has been the default generator (underlying build system) for
CMake configurations targeting Windows for some time***, but in Visual
Studio 2019 version 16.6 Preview 3*** we added support for Ninja on Linux."

4. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-160
" `generator`: specifies CMake generator to use for this configuration.
May be one of:

    Visual Studio 2019 only:
        Visual Studio 16 2019
        Visual Studio 16 2019 Win64
        Visual Studio 16 2019 ARM

    Visual Studio 2017 and later:
        Visual Studio 15 2017
        Visual Studio 15 2017 Win64
        Visual Studio 15 2017 ARM
        Visual Studio 14 2015
        Visual Studio 14 2015 Win64
        Visual Studio 14 2015 ARM
        Unix Makefiles
        Ninja

Because Ninja is designed for fast build speeds instead of flexibility
and function, it is set as the default. However, some CMake projects may
be unable to correctly build using Ninja. If this occurs, you can
instruct CMake to generate Visual Studio projects instead.

To specify a Visual Studio generator in Visual Studio 2017, open the
settings editor from the main menu by choosing CMake | Change CMake
Settings. Delete "Ninja" and type "V". This activates IntelliSense,
which enables you to choose the generator you want."

"To specify a Visual Studio generator in Visual Studio 2019, right-click
on the CMakeLists.txt file in Solution Explorer and choose CMake
Settings for project > Show Advanced Settings > CMake Generator.

When the active configuration specifies a Visual Studio generator, by
default MSBuild.exe is invoked with` -m -v:minimal` arguments."

5. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019
"Enable CMakePresets.json integration in Visual Studio 2019

CMakePresets.json integration isn't enabled by default in Visual Studio
2019. You can enable it for all CMake projects in Tools > Options >
CMake > General: (tick a box)" ... see more.

6. https://docs.microsoft.com/en-us/cpp/build/cmakesettings-reference?view=msvc-140
(whichever v140 is..)
"CMake projects are supported in Visual Studio 2017 and later."

7. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150
"Support added for the CMake Ninja generator."

8. https://docs.microsoft.com/en-us/cpp/overview/what-s-new-for-cpp-2017?view=msvc-150#cmake-support-via-open-folder
"CMake support via Open Folder
Visual Studio 2017 introduces support for using CMake projects without
converting to MSBuild project files (.vcxproj). For more information,
see CMake projects in Visual
Studio[https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-150].
Opening CMake projects with Open Folder automatically configures the
environment for C++ editing, building, and debugging." ... +more!

9. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#supported-cmake-and-cmakepresetsjson-versions
"Visual Studio reads and evaluates CMakePresets.json and
CMakeUserPresets.json itself and doesn't invoke CMake directly with the
--preset option. So, CMake version 3.20 or later isn't strictly required
when you're building with CMakePresets.json inside Visual Studio. We
recommend using CMake version 3.14 or later."

10. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#enable-cmakepresetsjson-integration-in-visual-studio-2019
"If you don't want to enable CMakePresets.json integration for all CMake
projects, you can enable CMakePresets.json integration for a single
CMake project by adding a CMakePresets.json file to the root of the open
folder. You must close and reopen the folder in Visual Studio to
activate the integration.

11. https://docs.microsoft.com/en-us/cpp/build/cmake-presets-vs?view=msvc-160#default-configure-presets
***(doesn't actually say which version..)
"Default Configure Presets
If no CMakePresets.json or CMakeUserPresets.json file exists, or if
CMakePresets.json or CMakeUserPresets.json is invalid, Visual Studio
will fall back*** on the following default Configure Presets:

Windows example
JSON
{
  "name": "windows-default",
  "displayName": "Windows x64 Debug",
  "description": "Sets Ninja generator, compilers, x64 architecture,
build and install directory, debug build type",
  "generator": "Ninja",
  "binaryDir": "${sourceDir}/out/build/${presetName}",
  "architecture": {
    "value": "x64",
    "strategy": "external"
  },
  "cacheVariables": {
    "CMAKE_BUILD_TYPE": "Debug",
    "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
  },
  "vendor": {
    "microsoft.com/VisualStudioSettings/CMake/1.0": {
      "hostOS": [ "Windows" ]
    }
  }
},
"

Signed-off-by: Philip Oakley <philipoakley@iee.email>
This is needed for the next commit, where we add HOST_CPU to the CMake
invocation.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The CMakeSettings.json file is tool generated. Developers may track it
should they provide additional settings.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
This is needed for the next change, where we add HOST_CPU support to the
CMake definition.

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>
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>
As mentioned in the Makefile and CMakeLists.txt: "When cross-compiling, define HOST_CPU as the canonical name of the CPU on which the built Git will run (for instance "x86_64")"

This commit sets the HOST_CPU variable since Git for Windows arm64 is cross-compiled from an amd64 host.

Signed-off-by: Dennis Ameling <dennis@dennisameling.com>
We now have a GitHub Action to download and cache Azure Pipelines
artifacts (such as the `vcpkg` artifacts), hiding gnarly internals, and
also providing some robustness against network glitches. Let's use it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
In Git for Windows, `has_symlinks` is set to 0 by default. Therefore, we
need to parse the config setting `core.symlinks` to know if it has been
set to `true`. In `git init`, we must do that before copying the
templates because they might contain symbolic links.

Even if the support for symbolic links on Windows has not made it to
upstream Git yet, we really should make sure that all the `core.*`
settings are parsed before proceeding, as they might very well change
the behavior of `git init` in a way the user intended.

This fixes git-for-windows#3414

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
On LLP64 systems, such as Windows, the size of `long`, `int`, etc. is
only 32 bits (for backward compatibility). Git's use of `unsigned long`
for file memory sizes in many places, rather than size_t, limits the
handling of large files on LLP64 systems (commonly given as `>4GB`).

Provide a minimum test for handling a >4GB file. The `hash-object`
command, with the  `--literally` and without `-w` option avoids
writing the object, either loose or packed. This avoids the code paths
hitting the `bigFileThreshold` config test code, the zlib code, and the
pack code.

Subsequent patches will walk the test's call chain, converting types to
`size_t` (which is larger in LLP64 data models) where appropriate.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The previous commit adds a test that demonstrates a problem in the
`hash-object --literally` command, manifesting in an unnecessary file
size limit on systems using the LLP64 data model (which includes
Windows).

Walking the affected code path is `cmd_hash_object()` >> `hash_fd()` >>
`hash_literally()` >> `hash_object_file_literally()`.

The function `hash_object_file_literally()` is the first with a file
length parameter (via a mem buffer). This commit changes the type of
that parameter to the LLP64 compatible `size_t` type.

There are no other uses of the function. The `strbuf` type is already
`size_t` compatible.

Note: The hash-object test does not yet pass. Subsequent commits will
continue to walk the call tree's lower level functions to identify
further fixes.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is another fall-out of the recent refactoring flurry.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue walking the code path for the >4GB `hash-object --literally`
test. The `hash_object_file_literally()` function internally uses both
`hash_object_file()` and `write_object_file_prepare()`. Both function
signatures use `unsigned long` rather than `size_t` for the mem buffer
sizes. Use `size_t` instead, for LLP64 compatibility.

While at it, convert those function's object's header buffer length to
`size_t` for consistency. The value is already upcast to `uintmax_t` for
print format compatibility.

Note: The hash-object test still does not pass. A subsequent commit
continues to walk the call tree's lower level hash functions to identify
further fixes.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This fixes the build after 7bc341e (git-compat-util: add a test
balloon for C99 support, 2021-12-01).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Continue walking the code path for the >4GB `hash-object --literally`
test to the hash algorithm step for LLP64 systems.

This patch lets the SHA1DC code use `size_t`, making it compatible with
LLP64 data models (as used e.g. by Windows).

The interested reader of this patch will note that we adjust the
signature of the `git_SHA1DCUpdate()` function without updating _any_
call site. This certainly puzzled at least one reviewer already, so here
is an explanation:

This function is never called directly, but always via the macro
`platform_SHA1_Update`, which is usually called via the macro
`git_SHA1_Update`. However, we never call `git_SHA1_Update()` directly
in `struct git_hash_algo`. Instead, we call `git_hash_sha1_update()`,
which is defined thusly:

    static void git_hash_sha1_update(git_hash_ctx *ctx,
                                     const void *data, size_t len)
    {
        git_SHA1_Update(&ctx->sha1, data, len);
    }

i.e. it contains an implicit downcast from `size_t` to `unsigned long`
(before this here patch). With this patch, there is no downcast anymore.

With this patch, finally, the t1007-hash-object.sh "files over 4GB hash
literally" test case is fixed.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This is now passed by default, ever since 6a8cbc4 (developer: enable
pedantic by default, 2021-09-03).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Just like the `hash-object --literally` code path, the `--stdin` code
path also needs to use `size_t` instead of `unsigned long` to represent
memory sizes, otherwise it would cause problems on platforms using the
LLP64 data model (such as Windows).

To limit the scope of the test case, the object is explicitly not
written to the object store, nor are any filters applied.

The `big` file from the previous test case is reused to save setup time;
To avoid relying on that side effect, it is generated if it does not
exist (e.g. when running via `sh t1007-*.sh --long --run=1,41`).

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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>
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>
If `feature.experimental` and `feature.manyFiles` are set and the user
has not explicitly turned off the builtin FSMonitor, we now start
the built-in FSMonitor by default.

Only forcing it when UNSET matches the behavior of UPDATE_DEFAULT_BOOL()
used for other repo settings.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 11:33 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
@vdye vdye temporarily deployed to monitor-components September 22, 2022 14:42 Inactive
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.

None yet