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.47.0-rc0 #5176

Merged
merged 1,055 commits into from
Sep 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
1055 commits
Select commit Hold shift + click to select a range
e05e2cd
pack-objects: add GIT_TEST_FULL_NAME_HASH
derrickstolee Sep 17, 2024
c5297f2
git-repack: update usage to match docs
derrickstolee Sep 9, 2024
a9be155
p5313: add size comparison test
derrickstolee Aug 28, 2024
385283b
test-tool: add helper for name-hash values
derrickstolee Sep 9, 2024
7031d21
Merge branch 'safe-PATH-lookup-in-gitk-on-Windows'
dscho Jan 21, 2023
bd5a2db
repack/pack-objects: mark `--full-name-hash` as experimental
dscho Sep 24, 2024
08f4b00
Merge 'remote-hg-prerequisites' into HEAD
dscho Jun 8, 2018
7695380
Merge branch 'drive-prefix'
dscho Jun 8, 2018
dcaf7b6
Merge branch 'dont-clean-junctions'
dscho Jul 30, 2019
9ef77ef
Merge branch 'msys2-python'
dscho May 31, 2019
53c9547
Merge branch 'mimalloc-v2.0.9'
dscho Sep 8, 2022
50747a3
Merge pull request #2375 from assarbad/reintroduce-sideband-config
dscho Oct 30, 2019
b8d0020
Merge pull request #2405 from dscho/mingw-setsockopt
dscho Nov 25, 2019
b348769
Merge pull request #2449 from dscho/mingw-getcwd-and-symlinks
dscho Jan 3, 2020
af0be02
Merge pull request #2488 from bmueller84/master
dscho Jan 22, 2020
44f0395
Merge pull request #2501 from jeffhostetler/clink-debug-curl
dscho Jan 30, 2020
7b8eb64
Merge pull request #2504 from dscho/access-repo-via-junction
dscho Feb 1, 2020
a0a1f55
Merge pull request #2506 from dscho/issue-2283
dscho Feb 11, 2020
6441ed0
Merge pull request #2535 from dscho/schannel-revoke-best-effort
dscho Mar 4, 2020
4c739b1
Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
dscho May 9, 2020
718d0de
Merge 'add-p-many-files'
dscho Jun 8, 2018
b3be369
Merge pull request #2730 from dscho/crlf-aware-git-add-i
dscho Jul 2, 2020
a22fd7f
Merge pull request #2714 from lbonanomi/crlf-scissors
dscho Jul 3, 2020
1fb44ed
Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
dscho Oct 9, 2020
d7f51a7
Merge 'git-gui/js/intent-to-add'
dscho Oct 18, 2020
833517d
Merge pull request #2974 from derrickstolee/maintenance-and-headless
dscho Jan 11, 2021
6dd5ca6
cmake: install headless-git. (#4338)
dscho Mar 13, 2023
2e3d3ed
Merge pull request #2351 from PhilipOakley/vcpkg-tip
dscho Oct 7, 2019
ee76f5f
Merge pull request #2915 from dennisameling/windows-arm64-support
dscho Dec 9, 2020
1112d25
Merge pull request #3327 from dennisameling/fix-host-cpu
dscho Jul 19, 2021
10e81bd
Merge pull request #3165 from dscho/increase-allowed-length-of-interp…
dscho Apr 3, 2021
64c34b3
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
dscho May 17, 2021
757c30e
Merge pull request #3293 from pascalmuller/http-support-automatically…
dscho Jun 24, 2021
642bbe6
Merge pull request #3349 from vdye/feature/ci-subtree-tests
dscho Aug 10, 2021
ac530b7
Merge pull request #3306 from PhilipOakley/vs-sln
dscho Oct 12, 2021
47bd154
Merge pull request #3417 from dscho/initialize-core.symlinks-earlier
dscho Oct 13, 2021
63898eb
Merge branch 'mark-v4-fsmonitor-experimental' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
b05940b
Merge pull request #3533 from PhilipOakley/hashliteral_t
dscho Dec 15, 2021
debe3cc
Merge pull request #3791: Various fixes around `safe.directory`
derrickstolee Apr 13, 2022
267cfa3
Merge pull request #3751 from rkitover/native-term
dscho Apr 21, 2022
b055379
Merge pull request #3875 from 1480c1/wine/detect_msys_tty
dscho May 30, 2022
1faaafc
Merge branch 'optionally-dont-append-atomically-on-windows'
dscho Jun 23, 2022
bae4aed
Merge branch 'fsync-object-files-always'
dscho Oct 11, 2018
c3224ab
Merge branch 'ci-fixes'
dscho Feb 11, 2021
0c0c1c3
Merge pull request #3942 from rimrul/mingw-tsaware
dscho Jul 27, 2022
98427b2
Fix Windows version resources (#4092)
dscho Nov 3, 2022
41a5204
Merge branch 'builtin-swap-functions'
dscho Nov 23, 2022
bbdda8a
Add support for CLANGARM64 target (#3916)
dscho Oct 28, 2022
3c22761
Fix global repository field not being cleared (#4083)
dscho Dec 20, 2022
5f0c8ba
Skip linking the "dashed" `git-<command>`s for built-ins (#4252)
dscho Jan 31, 2023
a5a3edb
Git GUI: fix Repository>Explore Working Copy (#4357)
dscho Mar 21, 2023
fc632bc
Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (…
dscho May 15, 2023
a3555c2
Merge branch 'nano-server'
dscho Aug 7, 2023
e39d035
Additional error checks for issuing the windows.appendAtomically warn…
dscho Aug 7, 2023
e923edb
win32: use native ANSI sequence processing, if possible (#4700)
dscho Dec 2, 2023
dfd48be
ARM64: Embed manifest properly (#4718)
dscho Dec 7, 2023
9e80b0e
common-main.c: fflush stdout buffer when exit (#4901)
dscho Apr 12, 2024
7427367
Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
dscho Jul 12, 2024
847d01a
Merge branch 'Fix-i686-build-with-GCC-v14'
dscho Jul 12, 2024
94b7f9c
Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
dscho Jul 12, 2024
e5c11f5
path-walk: introduce an object walk by path
derrickstolee Aug 29, 2024
017e36a
t6601: add helper for testing path-walk API
derrickstolee Sep 18, 2024
3289262
path-walk: allow consumer to specify object types
derrickstolee Sep 1, 2024
a5f2805
path-walk: allow visiting tags
derrickstolee Sep 9, 2024
b6785fd
revision: create mark_trees_uninteresting_dense()
derrickstolee Sep 6, 2024
d1e895f
path-walk: add prune_all_uninteresting option
derrickstolee Sep 4, 2024
8a73f51
pack-objects: extract should_attempt_deltas()
derrickstolee Sep 24, 2024
bb182d9
pack-objects: add --path-walk option
derrickstolee Sep 5, 2024
f403cae
pack-objects: introduce GIT_TEST_PACK_PATH_WALK
derrickstolee Sep 6, 2024
0aa7820
repack: add --path-walk option
derrickstolee Sep 5, 2024
a004ba9
pack-objects: enable --path-walk via config
derrickstolee Sep 5, 2024
6749045
scalar: enable path-walk during push via config
derrickstolee Sep 5, 2024
3c063bb
pack-objects: refactor path-walk delta phase
derrickstolee Sep 18, 2024
c599014
pack-objects: thread the path-based compression
derrickstolee Sep 18, 2024
6ed4dbe
run-command: be helpful with Git LFS fails on Windows 7
dscho Jul 4, 2024
30b5cf7
backfill: add builtin boilerplate
derrickstolee Jun 7, 2024
19cbfed
backfill: basic functionality and tests
derrickstolee Sep 1, 2024
34b077a
backfill: add --batch-size=<n> option
derrickstolee Sep 1, 2024
a05ddaa
backfill: add --sparse option
derrickstolee Sep 1, 2024
65ea334
backfill: assume --sparse when sparse-checkout is enabled
derrickstolee Sep 1, 2024
c162f25
survey: stub in new experimental 'git-survey' command
jeffhostetler Apr 29, 2024
25da397
survey: add command line opts to select references
jeffhostetler Apr 29, 2024
30f822b
survey: start pretty printing data in table form
derrickstolee Sep 1, 2024
f3d90f9
backfill: mark it as experimental
dscho Sep 26, 2024
0c4bec0
survey: add object count summary
derrickstolee Sep 2, 2024
45bdbf0
survey: summarize total sizes by object type
derrickstolee Sep 2, 2024
6be5118
survey: show progress during object walk
derrickstolee Sep 2, 2024
62548a9
survey: add ability to track prioritized lists
derrickstolee Sep 2, 2024
545bf8c
survey: add report of "largest" paths
derrickstolee Sep 2, 2024
afc60cf
survey: add --top=<N> option and config
derrickstolee Sep 23, 2024
bb6ebd1
survey: clearly note the experimental nature in the output
dscho Jul 1, 2024
f2a4c1c
Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
dscho Jul 12, 2024
5b0a66d
pack-objects: create new name-hash algorithm (#5157)
dscho Sep 24, 2024
c881e3b
Add path walk API and its use in 'git pack-objects' (#5171)
derrickstolee Sep 25, 2024
b9173da
Introduce 'git backfill' to get missing blobs in a partial clone (#5172)
dscho Sep 26, 2024
d1dd712
Add experimental 'git survey' builtin (#5174)
dscho Sep 26, 2024
69522da
Win32: make FILETIME conversion functions public
kblees Jul 6, 2013
5b0c984
Win32: dirent.c: Move opendir down
kblees Sep 8, 2013
f1662b8
mingw: make the dirent implementation pluggable
kblees Sep 8, 2013
c22c1d2
Merge branch 'ready-for-upstream'
dscho Oct 11, 2018
7b4a13f
Win32: make the lstat implementation pluggable
kblees Sep 8, 2013
8a07e6c
mingw: add infrastructure for read-only file system level caches
kblees Sep 8, 2013
7aa8425
mingw: add a cache below mingw's lstat and dirent implementations
kblees Oct 1, 2013
c4473a9
fscache: add key for GIT_TRACE_FSCACHE
jeffhostetler Jan 24, 2017
cf70e90
fscache: load directories only once
kblees Jun 24, 2014
7678e5c
dir.c: make add_excludes aware of fscache during status
jeffhostetler Nov 1, 2017
1b4f462
fscache: remember not-found directories
jeffhostetler Dec 13, 2016
4b39ba5
fscache: make fscache_enabled() public
jeffhostetler Dec 20, 2017
eb91130
fscache: add a test for the dir-not-found optimization
dscho Jan 25, 2017
617c2d1
add: use preload-index and fscache for performance
jeffhostetler Nov 22, 2016
6ef3cc7
dir.c: regression fix for add_excludes with fscache
jeffhostetler Dec 20, 2017
6346624
fetch-pack.c: enable fscache for stats under .git/objects
Nov 22, 2017
c97a8dd
checkout.c: enable fscache for checkout again
Jan 30, 2018
4c3505c
Enable the filesystem cache (fscache) in refresh_index().
benpeart Sep 7, 2018
898a7b0
mem_pool: add GIT_TRACE_MEMPOOL support
benpeart Oct 4, 2018
62a9ebc
fscache: use FindFirstFileExW to avoid retrieving the short name
benpeart Oct 23, 2018
8b379b1
status: disable and free fscache at the end of the status command
benpeart Nov 1, 2018
7dfd5d4
fscache: add GIT_TEST_FSCACHE support
benpeart Oct 4, 2018
9f0398d
fscache: add fscache hit statistics
benpeart Sep 25, 2018
be72b30
fscache: fscache takes an initial size
benpeart Nov 2, 2018
6325d20
fscache: update fscache to be thread specific instead of global
benpeart Oct 4, 2018
34fe22c
fscache: teach fscache to use mempool
benpeart Nov 2, 2018
f085223
fscache: make fscache_enable() thread safe
benpeart Nov 16, 2018
1dda695
fscache: teach fscache to use NtQueryDirectoryFile
benpeart Nov 15, 2018
752e625
fscache: remember the reparse tag for each entry
dscho Dec 11, 2018
5effe01
fscache: implement an FSCache-aware is_mount_point()
dscho Dec 11, 2018
c2ff9e3
unpack-trees: enable fscache for sparse-checkout
derrickstolee Jun 12, 2019
7335e91
clean: make use of FSCache
dscho Dec 11, 2018
8134f3d
git-gui--askyesno: fix funny text wrapping
dscho Sep 20, 2017
ab36404
git-gui: provide question helper for retry fallback on Windows
hvoigt Feb 21, 2010
8694acf
git-gui--askyesno: allow overriding the window title
dscho Sep 20, 2017
18c726e
gitk: Unicode file name support
kblees Feb 4, 2012
f9bcdc7
git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
dscho Jul 23, 2010
9a4a9e2
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho Sep 20, 2017
b897abc
gitk: Use an external icon file on Windows
sschuberth Jul 22, 2012
fd6437d
gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6
dscho Feb 16, 2016
6d00dcb
Merge 'git-gui' into HEAD
dscho Jun 7, 2018
2fabe46
gitk: make the "list references" default window width wider
sidecut Jan 21, 2016
578d5ac
Merge branch 'git-gui-askyesno'
dscho Jun 8, 2018
60bdc80
Merge 'gitk' into HEAD
dscho Jun 7, 2018
8c01852
Merge branch 'fscache'
dscho Nov 15, 2018
0690488
Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd
dscho Jun 8, 2018
ae0542e
Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_…
dscho Jun 8, 2018
01b810d
Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fs…
dscho Jun 8, 2018
0fab810
Merge pull request #1426 from atetubou/fetch_pack
dscho Jun 8, 2018
5661c7a
Merge pull request #1468 from atetubou/fscache_checkout_flush
dscho Oct 12, 2018
8e9284e
Merge pull request #1827 from benpeart/fscache_refresh_index
dscho Sep 27, 2018
9b5aae3
Merge pull request #1908 from benpeart/FindFirstFileEx-gfw
dscho Nov 5, 2018
a0de7b3
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho Nov 5, 2018
a700a07
Merge pull request #1911 from benpeart/git_test_fscache-gfw
dscho Nov 5, 2018
6d75b07
Merge pull request #1910 from benpeart/fscache_statistics-gfw
dscho Nov 16, 2018
e9f9365
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho Nov 16, 2018
ecf074e
Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw
dscho Nov 26, 2018
09ea817
Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw
dscho Nov 27, 2018
9e8fef1
Merge branch 'fscache-and-sparse-checkout'
derrickstolee Jun 18, 2019
f970a6f
pack-objects (mingw): demonstrate a segmentation fault with large deltas
vangdfang Jan 9, 2014
c56225d
Merge branch 'dont-clean-junctions-fscache'
dscho Jul 23, 2019
e91062d
mingw: support long paths
kblees Jul 28, 2015
f6d060b
Win32: fix 'lstat("dir/")' with long paths
kblees Jul 4, 2014
a78e081
win32(long path support): leave drive-less absolute paths intact
dscho Sep 6, 2023
42a535e
compat/fsmonitor/fsm-*-win32: support long paths
jeffhostetler Mar 25, 2022
057f6d4
clean: suggest using `core.longPaths` if paths are too long to remove
mathstuf Apr 22, 2022
d792ed3
strbuf_readlink: don't call readlink twice if hint is the exact link …
kblees May 11, 2015
a15c613
strbuf_readlink: support link targets that exceed PATH_MAX
kblees May 11, 2015
6275390
lockfile.c: use is_dir_sep() instead of hardcoded '/' checks
kblees May 11, 2015
d8d09ab
mingw: Support `git_terminal_prompt` with more terminals
kblees Mar 19, 2015
768c262
Win32: don't call GetFileAttributes twice in mingw_lstat()
kblees May 12, 2015
13aad84
compat/terminal.c: only use the Windows console if bash 'read -r' fails
kblees May 9, 2015
86f1eae
Win32: implement stat() with symlink support
kblees May 15, 2015
b32df1e
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho Feb 23, 2018
22bf97f
Win32: remove separate do_lstat() function
kblees May 11, 2015
adc69e9
Win32: let mingw_lstat() error early upon problems with reparse points
kblees May 23, 2015
49cc901
mingw: teach fscache and dirent about symlinks
kblees Jan 10, 2017
9c27ec7
Win32: lstat(): return adequate stat.st_size for symlinks
kblees May 15, 2015
e943c58
Win32: factor out retry logic
kblees May 19, 2015
b105378
Win32: change default of 'core.symlinks' to false
kblees May 23, 2015
f0f022d
Win32: add symlink-specific error codes
kblees May 15, 2015
faa04b5
Win32: mingw_unlink: support symlinks to directories
kblees May 23, 2015
8e50d25
Win32: mingw_rename: support renaming symlinks
kblees May 19, 2015
c720d21
Win32: mingw_chdir: change to symlink-resolved directory
kblees May 23, 2015
a9938d0
Win32: implement readlink()
kblees May 23, 2015
92f6f6c
mingw: lstat: compute correct size for symlinks
billziss-gh May 28, 2020
f372e99
Win32: implement basic symlink() functionality (file symlinks only)
kblees May 23, 2015
fd7535d
Win32: symlink: add support for symlinks to directories
kblees May 23, 2015
6203204
mingw: try to create symlinks without elevated permissions
dscho May 30, 2017
fcef52a
mingw: emulate stat() a little more faithfully
dscho Mar 2, 2020
1917acd
mingw: special-case index entries for symlinks with buggy size
dscho Jun 4, 2020
f9e8663
mingw: introduce code to detect whether we're inside a Windows container
ZCube Apr 23, 2018
ae7ce1b
mingw: when running in a Windows container, try to rename() harder
ZCube Apr 23, 2018
e4d85dd
mingw: move the file_attr_to_st_mode() function definition
ZCube Apr 23, 2018
8a7b14f
mingw: Windows Docker volumes are *not* symbolic links
dscho Apr 23, 2018
2191e90
mingw: work around rename() failing on a read-only file
dsl101 Jul 28, 2023
7a5d265
Win32: symlink: move phantom symlink creation to a separate function
piscisaureus Oct 26, 2018
2c414ca
Introduce helper to create symlinks that knows about index_state
dscho Feb 11, 2019
880d387
mingw: allow to specify the symlink type in .gitattributes
piscisaureus Oct 26, 2018
bf3bbc3
mingw: explicitly specify with which cmd to prefix the cmdline
dscho Jul 20, 2017
b8dc8ab
mingw: when path_lookup() failed, try BusyBox
dscho Jul 20, 2017
bf25de0
test-lib: avoid unnecessary Perl invocation
dscho Aug 5, 2017
49ea6d6
test-tool: learn to act as a drop-in replacement for `iconv`
dscho Jul 20, 2017
0656ea5
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho Jul 20, 2017
cfebe5d
gitattributes: mark .png files as binary
dscho Oct 11, 2018
c30acd3
Win32: symlink: add test for `symlink` attribute
piscisaureus Oct 26, 2018
eb3d3e6
tests: move test PNGs into t/lib-diff/
dscho Aug 5, 2017
e9e724b
tests: only override sort & find if there are usable ones in /usr/bin/
dscho Jul 17, 2017
2fcd9d9
tests: use the correct path separator with BusyBox
dscho Nov 19, 2018
4e9c7a2
mingw: only use Bash-ism `builtin pwd -W` when available
dscho Jun 29, 2017
3a0450e
tests (mingw): remove Bash-specific pwd option
dscho Jun 30, 2017
f3d15bb
test-lib: add BUSYBOX prerequisite
dscho Jul 19, 2017
522f574
t5003: use binary file from t/lib-diff/
dscho Aug 5, 2017
709c8bc
t5532: workaround for BusyBox on Windows
dscho Jul 21, 2017
80230b3
t5605: special-case hardlink test for BusyBox-w32
dscho Jul 21, 2017
dcd9dd4
t5813: allow for $PWD to be a Windows path
dscho Jul 5, 2017
da3aba0
t9200: skip tests when $PWD contains a colon
dscho Jul 7, 2017
ce3085a
mingw: kill child processes in a gentler way
dscho May 17, 2017
4826cd4
mingw: add a Makefile target to copy test artifacts
dscho Jul 19, 2017
6b8ce47
mingw: optionally enable wsl compability file mode bits
swigger Jun 7, 2023
b04f22e
mingw: really handle SIGINT
dscho Apr 22, 2018
b95b626
mingw: do not call xutftowcs_path in mingw_mktemp
neerajsi-msft Oct 27, 2021
09a0526
Partially un-revert "editor: save and reset terminal after calling ED…
dscho Nov 25, 2021
35dcdd9
Add a GitHub workflow to monitor component updates
dscho Sep 29, 2020
eab4d9d
reset: reinstate support for the deprecated --stdin option
dscho Dec 10, 2019
c10b13c
fsmonitor: reintroduce core.useBuiltinFSMonitor
vdye Apr 4, 2022
c5ea125
dependabot: help keeping GitHub Actions versions up to date
dscho Feb 6, 2024
1e3450a
Describe Git for Windows' architecture [no ci]
dscho Feb 13, 2023
2aebbed
Modify the Code of Conduct for Git for Windows
dscho Oct 11, 2019
8426302
CONTRIBUTING.md: add guide for first-time contributors
derrickstolee Mar 1, 2018
f6204b6
README.md: Add a Windows-specific preamble
dscho Jan 10, 2014
03bc833
Add an issue template
shiftkey Feb 18, 2016
cccb602
Modify the GitHub Pull Request template (to reflect Git for Windows)
Dec 22, 2017
d081204
.github: Add configuration for the Sentiment Bot
dscho Feb 20, 2018
bbd23b4
Document how $HOME is set on Windows
alejandro5042 Mar 9, 2018
418a02d
SECURITY.md: document Git for Windows' policies
dscho Aug 23, 2019
091e07d
Merge branch 'gitk-and-git-gui-patches'
dscho Oct 11, 2018
e3ccfe4
Merge branch 'long-paths'
dscho Nov 15, 2018
85e36aa
Merge branch 'fix-v4-fsmonitor-long-paths' into try-v4-fsmonitor
jeffhostetler Sep 29, 2021
d1e7a18
Merge pull request #3817 from mathstuf/name-too-long-advice
dscho Apr 22, 2022
3c22f9f
Merge branch 'msys2'
dscho Nov 15, 2018
d943c8c
Merge branch 'kblees/kb/symlinks'
dscho Nov 15, 2018
69d03be
Merge 'docker-volumes-are-no-symlinks'
dscho Oct 12, 2018
87633f4
mingw: try resetting the read-only bit if rename fails (#4527)
dscho Aug 7, 2023
3f97b62
Merge pull request #1897 from piscisaureus/symlink-attr
dscho Oct 31, 2018
4c29e39
Merge branch 'busybox-w32'
dscho Feb 7, 2019
5b55927
Merge branch 'wsl-file-mode-bits'
dscho Aug 7, 2023
80d21e8
Merge pull request #1170 from dscho/mingw-kill-process
dscho Oct 11, 2018
10ef0bb
Merge pull request #3492 from dscho/ns/batched-fsync
vdye Oct 28, 2021
2d12f17
Merge branch 'un-revert-editor-save-and-reset'
dscho Jan 15, 2022
2914314
Merge branch 'phase-out-reset-stdin'
dscho Jun 8, 2018
8fea9b9
Merge branch 'deprecate-core.useBuiltinFSMonitor'
dscho Jan 24, 2023
fa0216e
Merge pull request #2837 from dscho/monitor-component-updates
dscho Oct 7, 2020
e6b0617
Merge 'readme' into HEAD
dscho Jun 7, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SECURITY.md: document Git for Windows' policies
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>
dscho committed Sep 26, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 418a02d4583800ec849332c35d1cce8a21422291
56 changes: 35 additions & 21 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -28,24 +28,38 @@ Examples for details to include:

## Supported Versions

There are no official "Long Term Support" versions in Git.
Instead, the maintenance track (i.e. the versions based on the
most recently published feature release, also known as ".0"
version) sees occasional updates with bug fixes.

Fixes to vulnerabilities are made for the maintenance track for
the latest feature release and merged up to the in-development
branches. The Git project makes no formal guarantee for any
older maintenance tracks to receive updates. In practice,
though, critical vulnerability fixes are applied not only to the
most recent track, but to at least a couple more maintenance
tracks.

This is typically done by making the fix on the oldest and still
relevant maintenance track, and merging it upwards to newer and
newer maintenance tracks.

For example, v2.24.1 was released to address a couple of
[CVEs](https://cve.mitre.org/), and at the same time v2.14.6,
v2.15.4, v2.16.6, v2.17.3, v2.18.2, v2.19.3, v2.20.2, v2.21.1,
v2.22.2 and v2.23.1 were released.
Git for Windows is a "friendly fork" of [Git](https://git-scm.com/), i.e. changes in Git for Windows are frequently contributed back, and Git for Windows' release cycle closely following Git's.

While Git maintains several release trains (when v2.19.1 was released, there were updates to v2.14.x-v2.18.x, too, for example), Git for Windows follows only the latest Git release. For example, there is no Git for Windows release corresponding to Git v2.16.5 (which was released after v2.19.0).

One exception is [MinGit for Windows](https://github.com/git-for-windows/git/wiki/MinGit) (a minimal subset of Git for Windows, intended for bundling with third-party applications that do not need any interactive commands nor support for `git svn`): critical security fixes are backported to the v2.11.x, v2.14.x, v2.19.x, v2.21.x and v2.23.x release trains.

## Version number scheme

The Git for Windows versions reflect the Git version on which they are based. For example, Git for Windows v2.21.0 is based on Git v2.21.0.

As Git for Windows bundles more than just Git (such as Bash, OpenSSL, OpenSSH, GNU Privacy Guard), sometimes there are interim releases without corresponding Git releases. In these cases, Git for Windows appends a number in parentheses, starting with the number 2, then 3, etc. For example, both Git for Windows v2.17.1 and v2.17.1(2) were based on Git v2.17.1, but the latter included updates for Git Credential Manager and Git LFS, fixing critical regressions.

## Tag naming scheme

Every Git for Windows version is tagged using a name that starts with the Git version on which it is based, with the suffix `.windows.<patchlevel>` appended. For example, Git for Windows v2.17.1' source code is tagged as [`v2.17.1.windows.1`](https://github.com/git-for-windows/git/releases/tag/v2.17.1.windows.1) (the patch level is always at least 1, given that Git for Windows always has patches on top of Git). Likewise, Git for Windows v2.17.1(2)' source code is tagged as [`v2.17.1.windows.2`](https://github.com/git-for-windows/git/releases/tag/v2.17.1.windows.2).

## Release Candidate (rc) versions

As a friendly fork of Git (the "upstream" project), Git for Windows is closely corelated to that project.

Consequently, Git for Windows publishes versions based on Git's release candidates (for upcoming "`.0`" versions, see [Git's release schedule](https://tinyurl.com/gitCal)). These versions end in `-rc<n>`, starting with `-rc0` for a very early preview of what is to come, and as with regular versions, Git for Windows tries to follow Git's releases as quickly as possible.

Note: there is currently a bug in the "Check daily for updates" code, where it mistakes the final version as a downgrade from release candidates. Example: if you installed Git for Windows v2.23.0-rc3 and enabled the auto-updater, it would ask you whether you want to "downgrade" to v2.23.0 when that version was available.

[All releases](https://github.com/git-for-windows/git/releases/), including release candidates, are listed via a link at the footer of the [Git for Windows](https://gitforwindows.org/) home page.

## Snapshot versions ('nightly builds')

Git for Windows also provides snapshots (these are not releases) of the the current development as per git-for-Windows/git's `master` branch at the [Snapshots](https://wingit.blob.core.windows.net/files/index.html) page. This link is also listed in the footer of the [Git for Windows](https://gitforwindows.org/) home page.

Note: even if those builds are not exactly "nightly", they are sometimes referred to as "nightly builds" to keep with other projects' nomenclature.

## Following upstream's developments

The [gitforwindows/git repository](https://github.com/git-for-windows/git) also provides the `shears/*` branches. The `shears/*` branches reflect Git for Windows' patches, rebased onto the upstream integration branches, [updated (mostly) via automated CI builds](https://dev.azure.com/git-for-windows/git/_build?definitionId=25).