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.39.0 #4160

Merged
merged 372 commits into from
Dec 12, 2022
Merged

Rebase to v2.39.0 #4160

merged 372 commits into from
Dec 12, 2022

Conversation

dscho
Copy link
Member

@dscho dscho commented Dec 12, 2022

Range-diff relative to `main`
  • 1: 193b701 = 1: 2f0c4b1 t9350: point out that refs are not updated correctly

  • 2: 4f60b74 = 2: e4f37b3 transport-helper: add trailing --

  • 3: 663ba5f = 3: 988c460 remote-helper: check helper status after import/export

  • 4: f111b13 = 4: 5d96ded mingw: demonstrate a problem with certain absolute paths

  • 5: fd690c3 = 5: 0bbf934 gitk: prevent overly long command lines

  • 6: 1273bef = 6: d2fd8bb clean: do not traverse mount points

  • 21: 6397099 = 7: e05197d mingw: include the Python parts in the build

  • 7: 7cba47b = 8: befcd58 Always auto-gc after calling a fast-import transport

  • 8: c56c196 = 9: 6d2a361 mingw: allow absolute paths without drive prefix

  • 9: 7872d6d = 10: 845189b mingw: change core.fsyncObjectFiles = 1 by default

  • 10: 321e3f9 = 11: 226ade2 gitk: Escape file paths before piping to git log

  • 22: 3356b55 = 12: f4f0b3c clean: remove mount points when possible

  • 23: d394fa0 = 13: 2751f5d Config option to disable side-band-64k for transport

  • 24: 3eb1a8b = 14: 92776cf mingw: make sure errno is set correctly when socket operations fail

  • 11: d5e9289 = 15: ceef40c vcxproj: unclash project directories with build outputs

  • 12: e3ca982 = 16: 3d190f1 mingw: ensure valid CTYPE

  • 14: 0933cab = 17: 91e35b9 t5505/t5516: allow running without .git/branches/ in the templates

  • 15: 7208c11 = 18: 329d625 mingw: allow git.exe to be used instead of the "Git wrapper"

  • 18: 60afdb1 = 19: 54582f7 t5505/t5516: fix white-space around redirectors

  • 19: 756ed71 = 20: 9ddf804 mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory

  • 13: 3b86f3e = 21: ad53187 mingw: demonstrate a git add issue with NTFS junctions

  • 16: 04ec6b7 = 22: 5a93880 strbuf_realpath(): use platform-dependent API if available

  • 17: 2584706 = 23: f2412ab Allow add -p and add -i with a large number of files

  • 31: 1b66433 = 24: 16652bc clink.pl: fix libexpatd.lib link error when using MSVC

  • 20: f09887d = 25: 58077f6 http: use new "best effort" strategy for Secure Channel revoke checking

  • 25: eff4264 = 26: 75f93b6 mingw: do resolve symlinks in getcwd()

  • 26: 6e9616b = 27: 0faeb82 mingw: fix fatal error working on mapped network drives on Windows

  • 27: 9720abe = 28: 5645ce9 clink.pl: fix MSVC compile script to handle libcurl-d.lib

  • 28: 9436424 = 29: 0b40774 mingw: implement a platform-specific strbuf_realpath()

  • 29: 8373150 = 30: 6e4147f t3701: verify that we can add lots of files interactively

  • 30: ba62690 = 31: 34cf831 git add -i: handle CR/LF line endings in the interactive input

  • 50: e27da9f = 32: 8250ba3 commit: accept "scissors" with CR/LF line endings

  • 51: 807788b = 33: 008b9eb t0014: fix indentation

  • 52: 0f01b67 = 34: 7171c01 git-gui: accommodate for intent-to-add files

  • 53: af78b07 = 35: 1c622bd Add a GitHub workflow to generate Git for Windows' Pacman package

  • 54: 9fbe493 = 36: 6535e3f git-artifacts: if GPG secrets are available, use them

  • 55: 5751926 = 37: 16d8a39 git-artifacts: also code-sign, if configured via the secrets

  • 32: f33e2ae = 38: 4f242a3 Makefile: clean up .ilk files when MSVC=1

  • 56: 2665b07 = 39: 95c6d96 git-artifacts: also build the installer

  • 33: e643fe6 = 40: 4daae41 vcbuild: add support for compiling Windows resource files

  • 57: c8f6e54 = 41: 818e644 git-artifacts: also build portable, mingit and mingit-busybox

  • 34: d3892f4 = 42: 6f34fec config.mak.uname: add git.rc to MSVC builds

  • 58: c732148 = 43: c2274d7 git-artifacts: also build 32-bit versions

  • 36: d3e766b = 44: 58b29c3 vcpkg_install: detect lack of Git

  • 35: 0ba1008 = 45: 402f81a clink.pl: ignore no-stack-protector arg on MSVC=1 builds

  • 59: a8441dd = 46: f986fd4 git-artifacts: also build the nuget package

  • 38: 26f96a9 = 47: 6910f69 vcpkg_install: add comment regarding slow network connections

  • 37: 60927a0 = 48: 3f7faed clink.pl: move default linker options for MSVC=1 builds

  • 60: a060316 = 49: b811eb5 git-artifacts: allow restricting which artifacts are built

  • 40: 5a2a487 = 50: 244f511 vcxproj: support building Windows/ARM64 binaries

  • 39: 8f92d58 = 51: 9b0d08b buildsystems: remove duplicate clause

  • 61: e882133 = 52: 00efb21 git-artifacts: allow specifying repo/ref via workflow_dispatch

  • 42: 69c451e = 53: 386481b vcbuild: install ARM64 dependencies when building ARM64 binaries

  • 41: 1297721 = 54: 377d0c3 vcxproj: handle resource files, too

  • 62: bf83b70 = 55: 73e8a82 git-artifacts: cache the build-installers artifact

  • 44: beb55e3 = 56: 7350acb vcbuild: add an option to install individual 'features'

  • 43: c981b04 = 57: 05e27aa vcxproj: ignore -fno-stack-protector and -fno-common

  • 63: 781ed8c = 58: 2338abc git-artifacts: use the cached build-installers instead of makepkg-git

  • 46: aad86e2 = 59: 24497b7 cmake: allow building for Windows/ARM64

  • 45: 6258bca = 60: 2dd3bc0 vcxproj: handle GUI programs, too

  • 64: 628651c = 61: 0760e37 git-artifacts: add ARM64 artifacts

  • 48: 5cd0ec7 ! 62: 666f8c9 ci(vs-build) also build Windows/ARM64 artifacts

    @@ .github/workflows/main.yml: jobs:
     +      matrix:
     +        arch: [x64, arm64]
          steps:
    -     - uses: actions/checkout@v2
    +     - uses: actions/checkout@v3
          - uses: git-for-windows/setup-git-for-windows-sdk@v1
     @@ .github/workflows/main.yml: jobs:
            uses: microsoft/setup-msbuild@v1
    @@ .github/workflows/main.yml: jobs:
            env:
     @@ .github/workflows/main.yml: jobs:
          - name: upload tracked files and build artifacts
    -       uses: actions/upload-artifact@v2
    +       uses: actions/upload-artifact@v3
            with:
     -        name: vs-artifacts
     +        name: vs-artifacts-${{ matrix.arch }}
    @@ .github/workflows/main.yml: jobs:
          name: win+VS test
     @@ .github/workflows/main.yml: jobs:
          - name: download tracked files and build artifacts
    -       uses: actions/download-artifact@v2
    +       uses: actions/download-artifact@v3
            with:
     -        name: vs-artifacts
     +        name: vs-artifacts-x64
  • 47: 0a20720 = 63: ab9f813 win32: add a helper to run git.exe without a foreground window

  • 65: bfaf12b = 64: b01c05d git-artifacts(arm64): avoid hard-linking the dashed built-ins

  • 70: 9ea3914 = 65: e4b5d6f Add schannel to curl installation

  • 72: f002bf2 = 66: 74c6336 git-artifacts: add workaround for GCM Core on ARM64

  • 49: 371fdcf = 67: 2a1818c git maintenance: avoid console window in scheduled tasks on Windows

  • 66: eaf3671 = 68: a94026e git-artifacts: use a narrower PATH

  • 67: 5d260e1 = 69: 203c8d8 git-artifacts: fix BUILD_ONLY handling for ARM64

  • 68: d5310c0 = 70: 86c7477 git-artifacts: extend the SKIP logic to handle pkg and build-arm64

  • 69: 43b0d92 = 71: 5473639 git-artifacts: mark all inputs as "not required"

  • 71: eddc8d2 = 72: 123c803 git-artifacts(build-arm64): build artifacts using the intended Git revision

  • 73: 3b78324 = 73: 58fe528 cmake(): allow setting HOST_CPU for cross-compilation

  • 74: 63ff5b3 = 74: f78b447 git-artifacts: use the setup-git-for-windows-sdk Action

  • 75: c268b84 = 75: 7ea02ec ci(): add HOST_CPU to CMake command

  • 79: 7bdb45d = 76: 3402e15 CMake: default Visual Studio generator has changed

  • 81: cb1ae8e = 77: 235cdc1 .gitignore: add Visual Studio CMakeSetting.json file

  • 83: b81f21a = 78: 6599056 subtree: update contrib/subtree test target

  • 84: 9929d91 = 79: 6ea6016 CMakeLists: add default "x64-windows" arch for Visual Studio

  • 85: d15eb4b = 80: 41ac7f9 fsmonitor: reintroduce core.useBuiltinFSMonitor

  • 88: e47ef15 = 81: 1b2294b ci(vs-build): download the vcpkg artifacts using a dedicated Action

  • 89: 874ed75 = 82: ca3347d mingw: allow for longer paths in parse_interpreter()

  • 90: 596d04d = 83: 36e1aa4 compat/vcbuild: document preferred way to build in Visual Studio

  • 91: 69a8799 = 84: 593bd29 http: optionally send SSL client certificate

  • 92: 2ae17b9 = 85: 1c86832 ci: run contrib/subtree tests in CI builds

  • 93: 66efb4e = 86: 8e3f1f7 CMake: show Win32 and Generator_platform build-option values

  • 94: 7cca8a1 = 87: 3a96862 init: do parse all core.* settings early

  • 97: f209fda = 88: 0c8d779 vcxproj: allow building with NO_PERL again

  • 98: c99d91a = 89: 77f6d01 vcxproj: require C11

  • 99: 411a518 = 90: 70fc176 vcxproj: ignore the -pedantic option

  • 100: bf69647 = 91: 97dbc78 vcxproj: include reftable when committing .vcxproj files

  • 101: 9a198fc = 92: 38231c6 vcxproj: handle libreftable_test, too

  • 102: 7cb39d9 = 93: bbf8f57 vcxproj: avoid escaping double quotes in the defines

  • 103: a2ff409 = 94: 57e8546 ci: adjust Azure Pipeline for runs_on_pool

  • 104: 80febed = 95: 1f34aae ci: stop linking the prove cache

  • 76: 8afb282 = 96: 0efec05 hash-object: demonstrate a >4GB/LLP64 problem

  • 105: c74f7be = 97: be133cb ci: reinstate Azure Pipelines support

  • 77: 883452b = 98: e7ab111 hash_object_file_literally(): use size_t

  • 106: 5bb40aa = 99: 9d3ed4e azure-pipeline: drop the GETTEXT_POISON job

  • 78: f162f4c = 100: db6ffba object-file.c: use size_t for header lengths

  • 107: 4d16911 = 101: b3ffc0c azure-pipeline: stop hard-coding apt-get calls

  • 80: 06cbf3d = 102: af89690 hash algorithms: use size_t for section lengths

  • 109: c1c15cb = 103: ce45d53 azure-pipeline: drop the code to write to/read from a file share

  • 82: 2b5ec28 = 104: b37e7dd hash-object --stdin: verify that it works with >4GB/LLP64

  • 111: f207169 = 105: 46667de azure-pipeline: use partial clone/parallel checkout to initialize minimal-sdk

  • 86: dcd7130 = 106: a85f7b5 hash-object: add another >4GB/LLP64 test case

  • 87: 768f423 = 107: cc58af6 setup: properly use "%(prefix)/" when in WSL

  • 113: 49e39d1 = 108: be0570d azure-pipeline: downcase the job name of the Linux32 job

  • 95: 221f5c2 = 109: ef9ea15 Enable the built-in FSMonitor as an experimental feature

  • 96: 2c5218f = 110: 6dbd5f9 hash-object: add a >4GB/LLP64 test case using filtered input

  • 115: 938a2c2 = 111: 92c080b compat/mingw.c: do not warn when failing to get owner

  • 116: e5608f0 = 112: 3c6378c mingw: $env:TERM="xterm-256color" for newer OSes

  • 117: 71cc202 = 113: 293b8ae winansi: check result and Buffer before using Name

  • 118: cf31e7b = 114: ad3a214 Add config option windows.appendAtomically

  • 119: 73674c4 = 115: 346472a azure-pipeline: run static-analysis on jammy

  • 108: 55508b3 = 116: 98d32ae win32/pthread: avoid name clashes with winpthread

  • 110: ed3d48d = 117: 394f50e git-compat-util: avoid redeclaring _DEFAULT_SOURCE

  • 112: bc64b5e = 118: 908903e Import the source code of mimalloc

  • 114: 4460475 = 119: 9eeb737 mimalloc: allow running in Windows Nano Server containers

  • 121: 2fbfd31 = 120: 33572e8 mimalloc: adjust for building inside Git

  • 122: b0b63d2 = 121: d6e6ea2 mimalloc: avoid %z format

  • 123: 92b9a34 = 122: 39fbe3f mimalloc: avoid having to link to psapi just for mimalloc

  • 124: e940c5e = 123: 7a0247a mimalloc: avoid having to link to bcrypt just for mimalloc

  • 125: f21ae97 = 124: 534cebd mimalloc: offer a build-time option to enable it

  • 126: 8758254 = 125: 6aad259 bswap.h: add support for built-in bswap functions

  • 127: 84a2e5a = 126: 7d6e888 mimalloc: make MIMALLOC_SHOW_STATS work with redirected stderr

  • 128: 2de8474 = 127: 485ab1b config.mak.uname: add support for clangarm64

  • 120: 917ddbc = 128: 960f97d MinGW: link as terminal server aware

  • 129: 941a651 = 129: a735dfa mingw: use mimalloc

  • 130: 8bd9400 = 130: 494b108 Fix Windows version resources

  • 131: 0c2018b = 131: d8e9f5b ci: create clangarm64-build.yml

  • 132: 355d576 = 132: 941265f Win32: make FILETIME conversion functions public

  • 133: e3e1ce1 = 133: 0d0d446 Win32: dirent.c: Move opendir down

  • 134: b280eef = 134: 2c03034 mingw: make the dirent implementation pluggable

  • 135: beb17da = 135: d532d85 Win32: make the lstat implementation pluggable

  • 136: 5f5a6c6 = 136: 9530b39 add infrastructure for read-only file system level caches

  • 137: b234051 = 137: d258fd0 mingw: add a cache below mingw's lstat and dirent implementations

  • 138: e9fd7e8 = 138: e47f1ed fscache: load directories only once

  • 139: ce58ce2 = 139: be7fbed fscache: add key for GIT_TRACE_FSCACHE

  • 140: c12f366 = 140: e9557e7 fscache: remember not-found directories

  • 141: 47b687a = 141: 8861f44 fscache: add a test for the dir-not-found optimization

  • 142: 32e5f56 = 142: 411e669 add: use preload-index and fscache for performance

  • 143: 5af4694 = 143: ae56627 dir.c: make add_excludes aware of fscache during status

  • 144: 5595a5e = 144: dfdb1e3 fscache: make fscache_enabled() public

  • 145: 20e1023 = 145: 4f026fb dir.c: regression fix for add_excludes with fscache

  • 146: 525eac4 = 146: 973b161 fetch-pack.c: enable fscache for stats under .git/objects

  • 147: 8807f87 = 147: 77434e7 checkout.c: enable fscache for checkout again

  • 148: 78d024d = 148: d1ec2a1 Enable the filesystem cache (fscache) in refresh_index().

  • 149: c210be1 = 149: 5349891 fscache: use FindFirstFileExW to avoid retrieving the short name

  • 150: f527013 = 150: a059205 status: disable and free fscache at the end of the status command

  • 151: 1ff063a = 151: 52e05f8 fscache: add GIT_TEST_FSCACHE support

  • 152: 5fde953 = 152: 5e1ad8e fscache: add fscache hit statistics

  • 153: 55f376b = 153: e829c89 mem_pool: add GIT_TRACE_MEMPOOL support

  • 154: e60a765 = 154: 65cab33 fscache: fscache takes an initial size

  • 155: ecc4e79 = 155: b9b9d50 fscache: update fscache to be thread specific instead of global

  • 156: 573d422 = 156: a6ef796 fscache: teach fscache to use mempool

  • 157: 739dfee = 157: 389f11a fscache: make fscache_enable() thread safe

  • 158: a560dd6 = 158: 6134b42 git-gui: provide question helper for retry fallback on Windows

  • 159: 7d6fd8c = 159: 92b1d21 fscache: teach fscache to use NtQueryDirectoryFile

  • 160: ac3a1f1 = 160: 06f120b git gui: set GIT_ASKPASS=git-gui--askpass if not set yet

  • 164: 05ca44a = 161: 71e1741 gitk: Unicode file name support

  • 161: 6eb0a05 = 162: a10d5db unpack-trees: enable fscache for sparse-checkout

  • 162: b5ed3a0 = 163: 44e4066 git-gui--askyesno: fix funny text wrapping

  • 167: cedb33a = 164: 91ddaed gitk: Use an external icon file on Windows

  • 163: e8ad7a1 = 165: fe61653 fscache: remember the reparse tag for each entry

  • 165: 1f3611e = 166: 36e2491 git-gui--askyesno: allow overriding the window title

  • 171: 724d0ca = 167: 037d74a gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6

  • 166: ad372d7 = 168: defc57f fscache: implement an FSCache-aware is_mount_point()

  • 168: 1f08873 = 169: 03b193f respect core.hooksPath, falling back to .git/hooks

  • 169: e8307f3 = 170: 1d1c97f git-gui--askyesno (mingw): use Git for Windows' icon, if available

  • 172: c0a3cc7 = 171: 2ada010 gitk: make the "list references" default window width wider

  • 170: f1bb728 = 172: 5bc0864 clean: make use of FSCache

  • 173: b9bc9e3 = 173: 26668da pack-objects (mingw): demonstrate a segmentation fault with large deltas

  • 174: bd3a59c = 174: b534531 mingw: support long paths

  • 175: 7bd3018 = 175: 17bef7f Win32: fix 'lstat("dir/")' with long paths

  • 176: 2dc4f30 = 176: 2a90c5d mingw: Support git_terminal_prompt with more terminals

  • 179: 0a25f18 = 177: b109e41 compat/terminal.c: only use the Windows console if bash 'read -r' fails

  • 180: 4822085 = 178: 07221a0 mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method

  • 181: 50db587 = 179: 549f4a1 Unbreak interactive GPG prompt upon signing

  • 182: d76993c = 180: b6cbf4f strbuf_readlink: don't call readlink twice if hint is the exact link size

  • 183: 865ab35 = 181: 8e6f5f3 strbuf_readlink: support link targets that exceed PATH_MAX

  • 184: 79011f8 = 182: fc9059b lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

  • 185: 2e33e4d = 183: 5ac069e Win32: don't call GetFileAttributes twice in mingw_lstat()

  • 186: 5b13950 = 184: f337aea Win32: implement stat() with symlink support

  • 177: 40aac6e = 185: 6fb0cf8 compat/fsmonitor/fsm-*-win32: support long paths

  • 178: 4b77331 = 186: cc57e83 clean: suggest using core.longPaths if paths are too long to remove

  • 187: 92a30f8 = 187: 40d0f2f Win32: remove separate do_lstat() function

  • 188: ed2c7ea = 188: 2e56150 Win32: let mingw_lstat() error early upon problems with reparse points

  • 189: 990e5c2 = 189: f4cbb8d mingw: teach fscache and dirent about symlinks

  • 190: 6c5efb8 = 190: cab2d36 Win32: lstat(): return adequate stat.st_size for symlinks

  • 191: 32d9d03 = 191: 31c2295 Win32: factor out retry logic

  • 192: 9653f2a = 192: 38902e2 Win32: change default of 'core.symlinks' to false

  • 193: 738f073 = 193: 1339dcb Win32: add symlink-specific error codes

  • 194: d1c7e59 = 194: bec7926 Win32: mingw_unlink: support symlinks to directories

  • 195: 320bff7 = 195: 08d9b82 Win32: mingw_rename: support renaming symlinks

  • 196: e166525 = 196: 0801424 Win32: mingw_chdir: change to symlink-resolved directory

  • 197: c3aa706 = 197: 74ba5d2 Win32: implement readlink()

  • 198: ec1e4a3 = 198: 500470a mingw: lstat: compute correct size for symlinks

  • 199: 96a715f = 199: 0dbca76 Win32: implement basic symlink() functionality (file symlinks only)

  • 200: bfb274e = 200: a439a9c Win32: symlink: add support for symlinks to directories

  • 201: 3354de8 = 201: cbaedc8 mingw: try to create symlinks without elevated permissions

  • 202: 3663651 = 202: 5d21a34 mingw: emulate stat() a little more faithfully

  • 203: ad374ad = 203: c1c70d2 mingw: special-case index entries for symlinks with buggy size

  • 205: 2ec063f = 204: d6b5408 Win32: symlink: move phantom symlink creation to a separate function

  • 206: 2bf8e61 = 205: 4ef3298 Introduce helper to create symlinks that knows about index_state

  • 207: 525ac7a = 206: c3c3aab mingw: allow to specify the symlink type in .gitattributes

  • 208: 36d0cfd = 207: c474a63 Win32: symlink: add test for symlink attribute

  • 209: 8b3b7cf = 208: bddc27a mingw: explicitly specify with which cmd to prefix the cmdline

  • 210: be56e0c = 209: a437ada mingw: when path_lookup() failed, try BusyBox

  • 204: 58fd786 = 210: 3403a87 mingw: introduce code to detect whether we're inside a Windows container

  • 211: ddacff2 = 211: 781826d test-lib: avoid unnecessary Perl invocation

  • 222: 729c03e = 212: b4100cf mingw: when running in a Windows container, try to rename() harder

  • 212: cde2063 = 213: e9893db tests: replace mingw_test_cmp with a helper in C

  • 224: 85fcfe2 = 214: 0312835 mingw: move the file_attr_to_st_mode() function definition

  • 213: 23b4adc = 215: bdc2b63 test-tool: learn to act as a drop-in replacement for iconv

  • 226: 33246b5 = 216: cd6175f mingw: Windows Docker volumes are not symbolic links

  • 214: fa351b8 = 217: 46b279b tests(mingw): if iconv is unavailable, use test-helper --iconv

  • 215: 7ec6293 = 218: ffc25a2 gitattributes: mark .png files as binary

  • 216: 60a5418 = 219: 9f9e8b5 tests: move test PNGs into t/lib-diff/

  • 217: 4b27b95 = 220: fd54f7d tests: only override sort & find if there are usable ones in /usr/bin/

  • 218: 3f99613 = 221: b54cc08 tests: use the correct path separator with BusyBox

  • 219: 612e150 = 222: 1429175 mingw: only use Bash-ism builtin pwd -W when available

  • 220: 7a324cb = 223: 03e011b tests (mingw): remove Bash-specific pwd option

  • 221: 47190b9 = 224: df5a508 test-lib: add BUSYBOX prerequisite

  • 223: a596313 = 225: 84d1bfc t0021: use Windows path when appropriate

  • 225: 545cfe2 = 226: 68573a7 t5003: use binary file from t/lib-diff/

  • 227: 8d49e17 = 227: 3179d3c t5532: workaround for BusyBox on Windows

  • 228: dd72cd0 = 228: dfb1165 t5605: special-case hardlink test for BusyBox-w32

  • 229: c8abd5a = 229: a6eab0c t5813: allow for $PWD to be a Windows path

  • 231: 1d85476 = 230: f1ca1a7 t9200: skip tests when $PWD contains a colon

  • 232: cc3c556 = 231: 1766d29 mingw: kill child processes in a gentler way

  • 233: 344ac3d = 232: 126b5bf mingw: do not call xutftowcs_path in mingw_mktemp

  • 235: d2ced5d = 233: 2acdac4 mingw: add a Makefile target to copy test artifacts

  • 236: 229729c = 234: 4047963 mingw: really handle SIGINT

  • 237: 902d7d0 = 235: f29cab8 Partially un-revert "editor: save and reset terminal after calling EDITOR"

  • 238: 41e8247 = 236: d86834b reset: reinstate support for the deprecated --stdin option

  • 230: 0b9edf5 = 237: 023ba99 Modify the Code of Conduct for Git for Windows

  • 234: ed6c886 = 238: 0c1a2b1 CONTRIBUTING.md: add guide for first-time contributors

  • 241: 9e7ed3b = 239: 63e9e21 README.md: Add a Windows-specific preamble

  • 242: 3e12721 = 240: 29b99d7 Add an issue template

  • 243: 3123838 = 241: 6676f0c Modify the GitHub Pull Request template (to reflect Git for Windows)

  • 244: b3284a2 = 242: 0d9b9e5 .github: Add configuration for the Sentiment Bot

  • 245: eae67e8 = 243: 646cd67 Document how $HOME is set on Windows

  • 239: 86814a0 = 244: fd3a140 mingw: deprecate old-style runtime-prefix handling in interpolate_path()

  • 240: e0f3e8a = 245: 96c0a89 Add a GitHub workflow to monitor component updates

  • 246: e1b95e1 = 246: 9d6c29d SECURITY.md: document Git for Windows' policies

vdye and others added 30 commits December 12, 2022 15:25
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>
This is another fall-out of the recent refactoring flurry.

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

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>
…imal-sdk

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

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>
Philip Oakley and others added 21 commits December 12, 2022 15:25
Git for Windows accepts pull requests; Core Git does not. Therefore we
need to adjust the template (because it only matches core Git's
project management style, not ours).

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

Signed-off-by: Philip Oakley <philipoakley@iee.org>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The sentiment bot will help detect when things get too heated.
Hopefully.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Git documentation refers to $HOME and $XDG_CONFIG_HOME often, but does not specify how or where these values come from on Windows where neither is set by default. The new documentation reflects the behavior of setup_windows_environment() in compat/mingw.c.

Signed-off-by: Alejandro Barreto <alejandro.barreto@ni.com>
…dvice

clean: suggest using `core.longPaths` if paths are too long to remove
On Windows, an absolute POSIX path needs to be turned into a Windows
one. We used to interpret paths starting with a single `/` as relative
to the runtime-prefix, but now these need to be prefixed with
`%(prefix)/`. Let's warn for now, but still handle it.

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

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

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

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

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

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>
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>
Previously, we interpolated paths in config variables that start with a
forward-slash as relative to the runtime prefix. This was not portable
and has been replaced with `%(prefix)/`.

Let's warn users when they use the now-deprecated form.

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 Dec 12, 2022
@dscho
Copy link
Member Author

dscho commented Dec 12, 2022

/git-artifacts

The Azure Pipeline run was started

@dscho dscho added this to the Next release milestone Dec 12, 2022
@dscho dscho linked an issue Dec 12, 2022 that may be closed by this pull request
@dscho
Copy link
Member Author

dscho commented Dec 12, 2022

/git-artifacts

The Azure Pipeline run was started

@dscho
Copy link
Member Author

dscho commented Dec 12, 2022

The release pipeline also succeeded.

@dscho dscho merged commit de9501c into git-for-windows:main Dec 12, 2022
@dscho dscho deleted the rebase-to-v2.39.0 branch December 12, 2022 20:16
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.39.0