Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
378 commits
Select commit Hold shift + click to select a range
d2354c7
vcpkg_install: add comment regarding slow network connections
PhilipOakley Oct 6, 2019
447fb2d
Add schannel to curl installation
dennisameling Dec 6, 2020
90cb663
cmake(): allow setting HOST_CPU for cross-compilation
dennisameling Jul 19, 2021
4b504f0
mingw: allow for longer paths in `parse_interpreter()`
dscho Apr 2, 2021
f09d5b8
compat/vcbuild: document preferred way to build in Visual Studio
dscho May 17, 2021
1ae7df9
http: optionally send SSL client certificate
pascalmuller Jun 23, 2021
956de5b
ci: run `contrib/subtree` tests in CI builds
vdye Aug 5, 2021
ee14b7c
mingw: stop hard-coding `CC = gcc`
dscho Nov 23, 2025
fc5f1df
mingw: drop the -D_USE_32BIT_TIME_T option
dscho Nov 21, 2025
2aea5f2
mingw: only use -Wl,--large-address-aware for 32-bit builds
dscho Nov 21, 2025
f29f4fa
hash-object: demonstrate a >4GB/LLP64 problem
PhilipOakley Oct 31, 2021
892554a
mingw: avoid over-specifying `--pic-executable`
dscho Nov 21, 2025
7a4ab7a
object-file.c: use size_t for header lengths
PhilipOakley Nov 12, 2021
b5142f0
mingw: set the prefix and HOST_CPU as per MSYS2's settings
dscho Nov 21, 2025
7b97ef5
hash algorithms: use size_t for section lengths
PhilipOakley Nov 12, 2021
2d90535
mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
dscho Nov 21, 2025
128cb67
Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
dscho Apr 13, 2021
0838ed3
hash-object --stdin: verify that it works with >4GB/LLP64
PhilipOakley Dec 6, 2021
254866d
mingw: rely on MSYS2's metadata instead of hard-coding it
dscho Nov 21, 2025
b04b9fb
mingw: ensure valid CTYPE
dscho Feb 21, 2017
6f14868
clink.pl: fix libexpatd.lib link error when using MSVC
jeffhostetler Mar 30, 2021
94fe6a4
CMakeLists: add default "x64-windows" arch for Visual Studio
PhilipOakley Apr 22, 2021
a788e44
hash-object: add another >4GB/LLP64 test case
PhilipOakley Dec 6, 2021
a69537a
setup: properly use "%(prefix)/" when in WSL
derrickstolee Apr 13, 2022
8be27f0
mingw: always define `ETC_*` for MSYS2 environments
dscho Nov 21, 2025
831cb4d
mingw: allow `git.exe` to be used instead of the "Git wrapper"
dscho Jan 31, 2020
29e6160
Makefile: clean up .ilk files when MSVC=1
jeffhostetler Apr 5, 2021
30edc6d
CMake: show Win32 and Generator_platform build-option values
PhilipOakley May 10, 2021
f5ecaf8
hash-object: add a >4GB/LLP64 test case using filtered input
PhilipOakley Dec 7, 2021
2e66641
compat/mingw.c: do not warn when failing to get owner
derrickstolee Apr 13, 2022
eacfc35
mingw: $env:TERM="xterm-256color" for newer OSes
rkitover Apr 12, 2022
1a91b93
winansi: check result and Buffer before using Name
1480c1 May 28, 2022
37ebc7f
Add config option `windows.appendAtomically`
sunzhuoshi Jan 15, 2022
18f689a
mingw: change core.fsyncObjectFiles = 1 by default
dscho Sep 4, 2017
43aee0b
MinGW: link as terminal server aware
rimrul Jul 10, 2022
2086020
Fix Windows version resources
Mortein Nov 2, 2022
b58439a
status: fix for old-style submodules with commondir
sceptical-coder Oct 28, 2022
9be4397
windows: skip linking `git-<command>` for built-ins
dscho Jan 27, 2023
3ad39ee
max_tree_depth: lower it for clang builds in general on Windows
dscho Nov 21, 2025
93cd8aa
mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system dire…
dscho Aug 25, 2020
7e43f92
vcbuild: add support for compiling Windows resource files
jeffhostetler Apr 5, 2021
94ef834
config.mak.uname: add git.rc to MSVC builds
jeffhostetler Apr 5, 2021
9ae8eaf
http: optionally load libcurl lazily
dscho May 6, 2023
faa8d5d
clink.pl: ignore no-stack-protector arg on MSVC=1 builds
jeffhostetler Apr 5, 2021
2cf919c
http: support lazy-loading libcurl also on Windows
dscho May 7, 2023
6081d57
clink.pl: move default linker options for MSVC=1 builds
jeffhostetler Apr 5, 2021
8b4c49f
http: when loading libcurl lazily, allow for multiple SSL backends
dscho May 7, 2023
de15876
mingw: make sure `errno` is set correctly when socket operations fail
dscho Nov 14, 2019
6c2adb9
survey: stub in new experimental 'git-survey' command
Apr 29, 2024
ad1f1c0
cmake: install headless-git.
Berrysoft Mar 11, 2023
df24313
git.rc: include winuser.h
rimrul Dec 2, 2023
264f3d5
mingw: do load libcurl dynamically by default
dscho May 7, 2023
a3c2d79
Add a GitHub workflow to verify that Git/Scalar work in Nano Server
dscho Nov 2, 2022
65fa347
mingw: suggest `windows.appendAtomically` in more cases
dsl101 Jul 28, 2023
7dbe1ae
win32: use native ANSI sequence processing, if possible
dscho Nov 22, 2023
7c70cdb
common-main.c: fflush stdout buffer upon exit
chengzhuo5 Apr 8, 2024
3450613
t5601/t7406(mingw): do run tests with symlink support
dscho Apr 9, 2024
586c8fe
win32: ensure that `localtime_r()` is declared even in i686 builds
dscho May 21, 2024
29b18b1
Fallback to AppData if XDG_CONFIG_HOME is unset
ariellourenco Jul 2, 2024
e1e8306
run-command: be helpful with Git LFS fails on Windows 7
dscho Jul 4, 2024
897ce9b
revision: create mark_trees_uninteresting_dense()
derrickstolee Sep 6, 2024
e9514ba
compat/mingw: handle WSA errors in strerror
rimrul Dec 22, 2024
599ea03
t5563: verify that NTLM authentication works
dscho Nov 26, 2025
2ab577c
mingw: introduce code to detect whether we're inside a Windows container
zcube Apr 23, 2018
37be6f9
Win32: symlink: move phantom symlink creation to a separate function
piscisaureus Oct 26, 2018
17994d1
compat/mingw: drop outdated comment
rimrul Dec 22, 2024
b40c789
http: disallow NTLM authentication by default
dscho Nov 26, 2025
79c9ca5
mingw: Support `git_terminal_prompt` with more terminals
kblees Mar 19, 2015
e2020dd
mingw: when running in a Windows container, try to rename() harder
zcube Apr 23, 2018
f751067
Introduce helper to create symlinks that knows about index_state
dscho Feb 11, 2019
102b727
t0301: actually test credential-cache on Windows
rimrul Dec 29, 2024
1dbd7bd
http: warn if might have failed because of NTLM
dscho Nov 26, 2025
1170ef3
compat/terminal.c: only use the Windows console if bash 'read -r' fails
kblees May 9, 2015
95a2919
mingw: move the file_attr_to_st_mode() function definition
zcube Apr 23, 2018
e3c2177
mingw: allow to specify the symlink type in .gitattributes
piscisaureus Oct 26, 2018
d690c2f
clean: do not traverse mount points
dscho Dec 7, 2018
bf10675
credential-cache: handle ECONNREFUSED gracefully
rimrul Dec 22, 2024
369ef25
reftable: do make sure to use custom allocators
dscho Mar 6, 2025
001002e
check-whitespace: avoid alerts about upstream commits
dscho Jun 3, 2025
d782708
t/t5571-prep-push-hook.sh: Add test with writing to stderr
t-b Jan 26, 2026
2ddfbbf
credential: advertise NTLM suppression and allow helpers to re-enable
dscho Feb 9, 2026
ad55f5c
dir: do not traverse mount points
maks244 Mar 30, 2026
6469e8b
win32: thread-utils: handle multi-socket systems
rimrul Feb 21, 2026
e61f828
t5563: add tests for http.emptyAuth with Negotiate
mjcheetham Apr 13, 2026
2f890aa
entry: flush fscache after creating directories and writing files
tyrielv May 18, 2026
c6b4d43
ci(macos): skip the `git p4` tests
dscho Nov 13, 2025
70e4802
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho Feb 23, 2018
ab4ed58
mingw: Windows Docker volumes are *not* symbolic links
dscho Apr 23, 2018
7f0a08c
mingw: work around rename() failing on a read-only file
dsl101 Jul 28, 2023
1df01f9
Win32: symlink: add test for `symlink` attribute
piscisaureus Oct 26, 2018
a38d888
clean: remove mount points when possible
dscho Dec 11, 2018
4f10e86
mingw: optionally enable wsl compability file mode bits
swigger Jun 7, 2023
aad709c
t9350: point out that refs are not updated correctly
SRabbelier Jul 24, 2011
7725d52
transport-helper: add trailing --
SRabbelier Aug 29, 2010
d2dc048
remote-helper: check helper status after import/export
SRabbelier Jul 23, 2011
47f4c67
Always auto-gc after calling a fast-import transport
dscho Apr 9, 2012
88d1260
survey: add command line opts to select references
Apr 29, 2024
182dd96
survey: start pretty printing data in table form
derrickstolee Sep 1, 2024
b8ccce3
survey: add object count summary
derrickstolee Sep 2, 2024
6bc797f
survey: summarize total sizes by object type
derrickstolee Sep 2, 2024
8ff8df7
survey: show progress during object walk
derrickstolee Sep 2, 2024
140f68a
survey: add ability to track prioritized lists
derrickstolee Sep 2, 2024
89e0d3b
survey: add report of "largest" paths
derrickstolee Sep 2, 2024
cf13718
survey: add --top=<N> option and config
derrickstolee Sep 23, 2024
135ca1e
survey: clearly note the experimental nature in the output
dscho Jul 1, 2024
7a008d6
Merge 'remote-hg-prerequisites' into HEAD
dscho Jun 8, 2018
3bc1eb8
Merge branch 'drive-prefix'
dscho Jun 8, 2018
845a13e
Merge branch 'msys2-python'
dscho May 31, 2019
d648704
Merge pull request #2375 from assarbad/reintroduce-sideband-config
dscho Oct 30, 2019
8073e64
Merge pull request #2488 from bmueller84/master
dscho Jan 22, 2020
0a26ee7
Merge pull request #2501 from jeffhostetler/clink-debug-curl
dscho Jan 30, 2020
c000d0d
Merge pull request #2504 from dscho/access-repo-via-junction
dscho Feb 1, 2020
bcf0d00
Merge pull request #2535 from dscho/schannel-revoke-best-effort
dscho Mar 4, 2020
19ded8d
Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
dscho May 9, 2020
448144c
Merge 'add-p-many-files'
dscho Jun 8, 2018
f725d6c
Merge pull request #2714 from lbonanomi/crlf-scissors
dscho Jul 3, 2020
96c87f4
Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
dscho Oct 9, 2020
0f605d7
Merge 'git-gui/js/intent-to-add'
dscho Oct 18, 2020
2946b82
Merge pull request #2351 from PhilipOakley/vcpkg-tip
dscho Oct 7, 2019
c1a3141
Merge pull request #2915 from dennisameling/windows-arm64-support
dscho Dec 9, 2020
cdaf7c3
Merge pull request #3327 from dennisameling/fix-host-cpu
dscho Jul 19, 2021
86691a9
Merge pull request #3165 from dscho/increase-allowed-length-of-interp…
dscho Apr 3, 2021
16f819d
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
dscho May 17, 2021
344b399
Merge pull request #3293 from pascalmuller/http-support-automatically…
dscho Jun 24, 2021
49a5e03
Merge pull request #3349 from vdye/feature/ci-subtree-tests
dscho Aug 10, 2021
572ac57
Merge pull request #3306 from PhilipOakley/vs-sln
dscho Oct 12, 2021
dbb6992
Merge pull request #3533 from PhilipOakley/hashliteral_t
dscho Dec 15, 2021
a06fd2c
Merge pull request #3791: Various fixes around `safe.directory`
derrickstolee Apr 13, 2022
a2bca8c
Merge pull request #3751 from rkitover/native-term
dscho Apr 21, 2022
df61a45
Merge pull request #3875 from 1480c1/wine/detect_msys_tty
dscho May 30, 2022
2910290
Merge branch 'optionally-dont-append-atomically-on-windows'
dscho Jun 23, 2022
c3c7916
Merge branch 'fsync-object-files-always'
dscho Oct 11, 2018
bd2c291
Merge pull request #3942 from rimrul/mingw-tsaware
dscho Jul 27, 2022
c4416ba
Fix Windows version resources (#4092)
dscho Nov 3, 2022
25719df
Fix global repository field not being cleared (#4083)
dscho Dec 20, 2022
e57073b
Skip linking the "dashed" `git-<command>`s for built-ins (#4252)
dscho Jan 31, 2023
f59a077
Add full `mingw-w64-git` (i.e. regular MSYS2 ecosystem) support (#5971)
dscho Nov 25, 2025
9325561
Merge pull request #2506 from dscho/issue-2283
dscho Feb 11, 2020
0f0eca1
Merge pull request #2974 from derrickstolee/maintenance-and-headless
dscho Jan 11, 2021
facce6f
ARM64: Embed manifest properly (#4718)
dscho Dec 7, 2023
20dcd0a
Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (…
dscho May 15, 2023
f3a534e
Merge branch 'nano-server'
dscho Aug 7, 2023
11f6c84
Additional error checks for issuing the windows.appendAtomically warn…
dscho Aug 7, 2023
19ac736
win32: use native ANSI sequence processing, if possible (#4700)
dscho Dec 2, 2023
2c48752
common-main.c: fflush stdout buffer when exit (#4901)
dscho Apr 12, 2024
9e858fb
Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
dscho Jul 12, 2024
0e82d6b
Merge branch 'Fix-i686-build-with-GCC-v14'
dscho Jul 12, 2024
519e01d
Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
dscho Jul 12, 2024
c8add1f
Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
dscho Jul 12, 2024
bbdca4c
Add path walk API and its use in 'git pack-objects' (#5171)
derrickstolee Sep 25, 2024
5f28c7e
Add experimental 'git survey' builtin (#5174)
dscho Sep 26, 2024
f3f0c09
credential-cache: handle ECONNREFUSED gracefully (#5329)
dscho Jan 1, 2025
4e5788f
Merge branch 'reftable-vs-custom-allocators'
dscho Jun 2, 2025
a8365fd
Merge branch 'check-whitespace-only-downstream'
dscho Jun 3, 2025
e1c08b7
t/t5571-prep-push-hook.sh: Add test with writing to stderr (#6063)
dscho Jan 27, 2026
f4a537c
Merge branch 'disallow-ntlm-auth-by-default'
dscho Feb 12, 2026
1589a4c
Don't traverse mount points in `remove_dir_recurse()` (#6151)
dscho Mar 31, 2026
f51bd9e
Detect number of cores better on multi-socket systems (#6108)
dscho Apr 6, 2026
a6f34b5
http: fix emptyAuth=auto for Negotiate/SPNEGO (#6170)
dscho Apr 14, 2026
d9aee32
entry: flush fscache after creating directories and writing files (#6…
dscho Jun 8, 2026
f746ca8
ci(macos): skip the `git p4` tests (#5954)
dscho Nov 14, 2025
17b7bf0
Merge branch 'msys2'
dscho Nov 15, 2018
1326c14
Merge 'docker-volumes-are-no-symlinks'
dscho Oct 12, 2018
25534c0
mingw: try resetting the read-only bit if rename fails (#4527)
dscho Aug 7, 2023
fb4bf66
Merge pull request #1897 from piscisaureus/symlink-attr
dscho Oct 31, 2018
19a6248
Merge branch 'dont-clean-junctions'
dscho Jul 30, 2019
eb6e88e
Merge branch 'wsl-file-mode-bits'
dscho Aug 7, 2023
f97de78
Win32: make FILETIME conversion functions public
kblees Jul 6, 2013
e2ec780
Win32: dirent.c: Move opendir down
kblees Sep 8, 2013
abfd800
mingw: make the dirent implementation pluggable
kblees Sep 8, 2013
6c4b4e4
Win32: make the lstat implementation pluggable
kblees Sep 8, 2013
79e5cee
mingw: add infrastructure for read-only file system level caches
kblees Sep 8, 2013
f58ca92
mingw: add a cache below mingw's lstat and dirent implementations
kblees Oct 1, 2013
44e8389
fscache: load directories only once
kblees Jun 24, 2014
c51e486
fscache: add key for GIT_TRACE_FSCACHE
jeffhostetler Jan 24, 2017
11f3b2c
fscache: remember not-found directories
jeffhostetler Dec 13, 2016
a6934e3
fscache: add a test for the dir-not-found optimization
dscho Jan 25, 2017
8d2179e
add: use preload-index and fscache for performance
jeffhostetler Nov 22, 2016
b3fb014
dir.c: make add_excludes aware of fscache during status
jeffhostetler Nov 1, 2017
cb8225b
fscache: make fscache_enabled() public
jeffhostetler Dec 20, 2017
3c6d5ce
dir.c: regression fix for add_excludes with fscache
jeffhostetler Dec 20, 2017
ebc5dc1
fetch-pack.c: enable fscache for stats under .git/objects
Nov 22, 2017
cfb77de
checkout.c: enable fscache for checkout again
Jan 30, 2018
0ab4385
Enable the filesystem cache (fscache) in refresh_index().
benpeart Sep 7, 2018
b825e14
mem_pool: add GIT_TRACE_MEMPOOL support
benpeart Oct 4, 2018
175c0df
fscache: use FindFirstFileExW to avoid retrieving the short name
benpeart Oct 23, 2018
b3aae7b
fscache: fscache takes an initial size
benpeart Nov 2, 2018
c97a534
fscache: remember the reparse tag for each entry
dscho Dec 11, 2018
3cc9f25
fscache: add GIT_TEST_FSCACHE support
benpeart Oct 4, 2018
7ee401b
fscache: update fscache to be thread specific instead of global
benpeart Oct 4, 2018
9146889
fscache: Windows Docker volumes are *not* symbolic links
dscho Apr 23, 2018
2097c6a
fscache: add fscache hit statistics
benpeart Sep 25, 2018
2165972
fscache: teach fscache to use mempool
benpeart Nov 2, 2018
a9d062f
fscache: optionally enable wsl compability file mode bits
swigger Jun 7, 2023
f099336
unpack-trees: enable fscache for sparse-checkout
derrickstolee Jun 12, 2019
a408468
fscache: make fscache_enable() thread safe
benpeart Nov 16, 2018
cef886c
fscache: implement an FSCache-aware is_mount_point()
dscho Dec 11, 2018
898a04a
git-gui--askyesno: fix funny text wrapping
dscho Sep 20, 2017
2975b0a
status: disable and free fscache at the end of the status command
benpeart Nov 1, 2018
cebe881
Merge branch 'fscache'
dscho Nov 15, 2018
01e72cf
fscache: teach fscache to use NtQueryDirectoryFile
benpeart Nov 15, 2018
aa15562
clean: make use of FSCache
dscho Dec 11, 2018
2f04a47
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho Sep 20, 2017
f2b3bdb
Merge branch 'ready-for-upstream'
dscho Oct 11, 2018
fcfaa06
mingw: explicitly specify with which cmd to prefix the cmdline
dscho Jul 20, 2017
a266ee7
mingw: when path_lookup() failed, try BusyBox
dscho Jul 20, 2017
27f26db
test-tool: learn to act as a drop-in replacement for `iconv`
dscho Jul 20, 2017
141a908
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho Jul 20, 2017
f8fb94a
gitattributes: mark .png files as binary
dscho Oct 11, 2018
06b91c7
tests: move test PNGs into t/lib-diff/
dscho Aug 5, 2017
73abc2c
tests: only override sort & find if there are usable ones in /usr/bin/
dscho Jul 17, 2017
da9cc1b
tests: use the correct path separator with BusyBox
dscho Nov 19, 2018
c82e175
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho Nov 5, 2018
bd83bb8
mingw: only use Bash-ism `builtin pwd -W` when available
dscho Jun 29, 2017
0d39dff
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho Nov 16, 2018
5afda95
tests (mingw): remove Bash-specific pwd option
dscho Jun 30, 2017
b82292f
Merge branch 'dont-clean-junctions-fscache'
dscho Jul 23, 2019
cccfb63
test-lib: add BUSYBOX prerequisite
dscho Jul 19, 2017
61f9229
pack-objects (mingw): demonstrate a segmentation fault with large deltas
vangdfang Jan 9, 2014
841b677
t5003: use binary file from t/lib-diff/
dscho Aug 5, 2017
2f2712f
mingw: support long paths
kblees Jul 28, 2015
1234b0a
t5532: workaround for BusyBox on Windows
dscho Jul 21, 2017
936b929
win32(long path support): leave drive-less absolute paths intact
dscho Sep 6, 2023
db509e4
t5605: special-case hardlink test for BusyBox-w32
dscho Jul 21, 2017
d23c43e
compat/fsmonitor/fsm-*-win32: support long paths
jeffhostetler Mar 25, 2022
c4562bc
t5813: allow for $PWD to be a Windows path
dscho Jul 5, 2017
d11a160
clean: suggest using `core.longPaths` if paths are too long to remove
mathstuf Apr 22, 2022
2788218
t9200: skip tests when $PWD contains a colon
dscho Jul 7, 2017
eb80739
Partially un-revert "editor: save and reset terminal after calling ED…
dscho Nov 25, 2021
ddc10a4
Describe Git for Windows' architecture
dscho Feb 13, 2023
c1479b4
Add an AGENTS.md file to help with AI-assisted debugging/development
dscho Jan 26, 2026
335b144
Modify the Code of Conduct for Git for Windows
dscho Oct 11, 2019
a48c0f3
CONTRIBUTING.md: add guide for first-time contributors
derrickstolee Mar 1, 2018
b6d2b16
README.md: Add a Windows-specific preamble
dscho Jan 10, 2014
937b83a
Add an issue template
shiftkey Feb 18, 2016
5727bb7
Add a GitHub workflow to monitor component updates
dscho Sep 29, 2020
768393d
Modify the GitHub Pull Request template (to reflect Git for Windows)
Dec 22, 2017
270d347
reset: reinstate support for the deprecated --stdin option
dscho Dec 10, 2019
7e8cfb4
fsmonitor: reintroduce core.useBuiltinFSMonitor
vdye Apr 4, 2022
6f05b1a
dependabot: help keeping GitHub Actions versions up to date
dscho Feb 6, 2024
9d9b3e9
SECURITY.md: document Git for Windows' policies
dscho Aug 23, 2019
135d966
Merge branch 'gitk-and-git-gui-patches'
dscho Oct 11, 2018
55e188e
Merge branch 'long-paths'
dscho Nov 15, 2018
450c4bf
Merge branch 'busybox-w32'
dscho Feb 7, 2019
26b6643
Merge branch 'un-revert-editor-save-and-reset'
dscho Jan 15, 2022
ea2407f
Merge branch 'phase-out-reset-stdin'
dscho Jun 8, 2018
9cd14eb
Merge branch 'deprecate-core.useBuiltinFSMonitor'
dscho Jan 24, 2023
50e57f6
Merge pull request #2837 from dscho/monitor-component-updates
dscho Oct 7, 2020
b36fc1e
ci: only run the expensive tests in the Windows tests for now
dscho Jun 12, 2026
761600d
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ jobs:
image: alpine:latest
# Supported until 2025-04-02.
- jobname: linux32
image: i386/ubuntu:focal
image: i386/ubuntu:20.04
# A RHEL 8 compatible distro. Supported until 2029-05-31.
- jobname: almalinux-8
image: almalinux:8
Expand Down
23 changes: 15 additions & 8 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ test:linux:
- jobname: linux-reftable
image: ubuntu:rolling
CC: clang
- jobname: linux-breaking-changes
image: ubuntu:20.04
CC: gcc
- jobname: fedora-breaking-changes-meson
image: fedora:latest
- jobname: linux-TEST-vars
image: ubuntu:20.04
CC: gcc
CC_PACKAGE: gcc-8
- jobname: linux-breaking-changes
image: ubuntu:rolling
CC: gcc
- jobname: fedora-breaking-changes-meson
image: fedora:latest
- jobname: linux-leaks
image: ubuntu:rolling
CC: gcc
Expand All @@ -60,13 +60,20 @@ test:linux:
- jobname: linux-asan-ubsan
image: ubuntu:rolling
CC: clang
- jobname: linux-meson
image: ubuntu:rolling
CC: gcc
- jobname: linux-musl-meson
image: alpine:latest
# Supported until 2025-04-02.
- jobname: linux32
image: i386/ubuntu:20.04
- jobname: linux-meson
image: ubuntu:rolling
CC: gcc
# A RHEL 8 compatible distro. Supported until 2029-05-31.
- jobname: almalinux-8
image: almalinux:8
# Supported until 2026-08-31.
- jobname: debian-11
image: debian:11
artifacts:
paths:
- t/failed-test-artifacts
Expand Down
70 changes: 70 additions & 0 deletions Documentation/RelNotes/2.55.0.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@ UI, Workflows & Features
* The documentation for "--word-diff" has been extended with a bit of
implementation detail of where these different words come from.

* "git config foo.bar=baz" is not likely to be a request to read the
value of such a variable with '=' in its name; rather it is plausible
that the user meant "git config set foo.bar baz". Give advice when
giving an error message.

* "git rev-list" (and "git log" family of commands) learned a new "--max-count-oldest"
that picks oldest N commits in the range instead of the usual newest.


Performance, Internal Implementation, Development Support etc.
--------------------------------------------------------------
Expand Down Expand Up @@ -171,6 +179,35 @@ Performance, Internal Implementation, Development Support etc.
* The loose object source has been refactored into a proper `struct
odb_source`.
* Guidelines on how to write a cover letter for a multi-patch series
have been added to SubmittingPatches, which also got a new marker
to separate the section for typofixes.
* The setup logic to discover and configure repositories has been
refactored, and the initialization of the object database has been
centralized.
* Many core configuration variables have been migrated from global
variables into 'repo_config_values' to tie them to a specific
repository instance, avoiding cross-repository state leakage.
* Streaming revision walks have been optimized by using a priority queue
for date-sorting commits, speeding up walks repositories with many
merges.
* A recent regression in t7527 that broke TAP output has been fixed,
some other test noise that also broke TAP output has been silenced,
and 'prove' is now configured to fail on invalid TAP output to
prevent future regressions.
* A handful of inappropriate uses of the_repository have been
rewritten to use the right repository structure instance in the
unpack-trees.c codepath.
* "git index-pack" has been optimized by retaining child bases in the
delta cache instead of immediately freeing them, letting the existing
cache limit policy decide eviction.
Fixes since v2.54
-----------------
Expand Down Expand Up @@ -322,6 +359,36 @@ Fixes since v2.54
sufficiently new linker is detected.
(merge 5cd4d0d850 hn/macos-linker-warning later to maint).

* Documentation and tests have been added to clarify that Git's internal
raw timestamp format requires a `@` prefix for values less than
100,000,000 to prevent ambiguity with other formats like YYYYMMDD.
(merge 4018dc29ee ls/doc-raw-timestamp-prefix later to maint).

* Wording used in "format-patch --subject-prefix" documentation
has been improved.
(merge 4a1eb9304a lo/doc-format-patch-subject-prefix later to maint).

* Advanced emulation of kill() used on Windows in GfW has been
upstreamed to improve the symptoms like left-behind .lock files and
that fails to let the child clean-up itself when it gets killed.
(merge 363f1d8b3a js/win-kill-child-more-gently later to maint).

* The 'git describe --contains --all' command has been fixed to
properly honor the '--match' and '--exclude' options by passing
them down to 'git name-rev' with the appropriate reference
prefixes.
(merge 1891707d1b jk/describe-contains-all-match-fix later to maint).

* Various typos, grammatical errors, and duplicated words in both
documentation and code comments have been corrected.
(merge dc6068df67 wy/docs-typofixes later to maint).

* The subprocess handshake during startup has been made gentler by using
packet_read_line_gently() instead of packet_read_line() to prevent the
parent Git process from dying abruptly when a configured subprocess
(e.g., a clean/smudge filter) fails to start.
(merge 061a68e443 mm/subprocess-handshake-fix later to maint).

* Other code cleanup, docfix, build fix, etc.
(merge 80f4b802e9 ja/doc-difftool-synopsis-style later to maint).
(merge b96490241e jc/doc-timestamps-in-stat later to maint).
Expand All @@ -344,3 +411,6 @@ Fixes since v2.54
(merge 1740cc35d0 ed/check-connected-close-err-fd later to maint).
(merge f4d7eb3d1c sp/doc-range-diff-takes-notes later to maint).
(merge 83e7f3bd2b kh/free-commit-list later to maint).
(merge d1b72b29e9 am/doc-tech-hash-typofix later to maint).
(merge 014c454799 ak/typofixes later to maint).
(merge 522ea8ef7d js/osxkeychain-build-wo-rust later to maint).
27 changes: 26 additions & 1 deletion Documentation/SubmittingPatches
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ input and avoids unnecessary churn from many rapid iterations.
topic are appropriate, so such an incremental updates are limited to
small corrections and polishing. After a topic cooks for some time
(like 7 calendar days) in 'next' without needing further tweaks on
top, it gets merged to the 'master' branch and wait to become part
top, it gets merged to the 'master' branch and waits to become part
of the next major release.

In the following sections, many techniques and conventions are listed
Expand Down Expand Up @@ -237,6 +237,7 @@ Do not forget to update the documentation to describe the updated
behavior and make sure that the resulting documentation set formats
well (try the Documentation/doc-diff script).

[[typofixes]]
We currently have a liberal mixture of US and UK English norms for
spelling and grammar, which is somewhat unfortunate. A huge patch that
touches the files all over the place only to correct the inconsistency
Expand Down Expand Up @@ -471,6 +472,30 @@ highlighted above.
Only capitalize the very first letter of the trailer, i.e. favor
"Signed-off-by" over "Signed-Off-By" and "Acked-by:" over "Acked-By".

[[cover-letter]]
=== Cover Letter

The purpose of your cover letter is to sell your changes, explain what
they are about, and get your target audience interested enough to read
the patches.

. Every code change comes with risk of regression and maintenance cost.
The cover letter should clearly communicate why the value of your
proposed change is worth applying. You can also describe how the risk
is reduced by the design choices you made while writing the patches.

. Make sure your target audience can understand what the patches are
about and why they are needed without prior context.

. For a second or subsequent iteration of the same topic, make sure
people who missed the earlier discussion can still understand what
the patches are about, so they can judge if the topic is worth their
time to read and comment on.

. To help those who are familiar with earlier iterations, give a
summary of changes since the previous rounds.


[[ai]]
=== Use of Artificial Intelligence (AI)

Expand Down
2 changes: 1 addition & 1 deletion Documentation/config/sideband.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sideband.allowControlCharacters::
Allow control sequences that move the cursor. This is
disabled by default.
`erase`::
Allow control sequences that erase charactrs. This is
Allow control sequences that erase characters. This is
disabled by default.
`false`::
Mask all control characters other than line feeds and
Expand Down
5 changes: 5 additions & 0 deletions Documentation/date-formats.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ Git internal format::
`<unix-timestamp>` is the number of seconds since the UNIX epoch.
`<time-zone-offset>` is a positive or negative offset from UTC.
For example CET (which is 1 hour ahead of UTC) is `+0100`.
+
It is safer to prepend the `<unix-timestamp>` with `@` (e.g.,
`@0 +0000`), which forces Git to interpret it as a raw timestamp. This
is required for values less than 100,000,000 (which have fewer than 9
digits) to avoid confusion with other date formats like `YYYYMMDD`.

RFC 2822::
The standard date format as described by RFC 2822, for example
Expand Down
2 changes: 1 addition & 1 deletion Documentation/fetch-options.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
`--all`::
`--no-all`::
Fetch all remotes, except for the ones that has the
Fetch all remotes, except for the ones that have the
`remote.<name>.skipFetchAll` configuration variable set.
This overrides the configuration variable `fetch.all`.

Expand Down
7 changes: 3 additions & 4 deletions Documentation/git-format-patch.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,9 @@ populated with placeholder text.
for generating the cover letter.

--subject-prefix=<subject-prefix>::
Instead of the standard '[PATCH]' prefix in the subject
line, instead use '[<subject-prefix>]'. This can be used
to name a patch series, and can be combined with the
`--numbered` option.
Use '[<subject-prefix>]' instead of the standard '[PATCH]'
prefix in the subject line. This can be used to name a patch
series, and can be combined with the `--numbered` option.
+
The configuration variable `format.subjectPrefix` may also be used
to configure a subject prefix to apply to a given repository for
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-format-rev.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ OPTIONS
The argument `rev` is also accepted.

`text`;; Formats all commit object names found in freeform text. These
must the full object names, i.e. abbreviated hexidecimal object
must be full object names, i.e. abbreviated hexadecimal object
names will not be interpreted.
+
Anything that is parsed as an object name but that is not found to be a
Expand Down
2 changes: 1 addition & 1 deletion Documentation/git-sparse-checkout.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ the `clean.requireForce` config option is set to `false`.
+
The `--dry-run` option will list the directories that would be removed
without deleting them. Running in this mode can be helpful to predict the
behavior of the clean comand or to determine which kinds of files are left
behavior of the clean command or to determine which kinds of files are left
in the sparse directories.
+
The `--verbose` option will list every file within the directories that
Expand Down
5 changes: 4 additions & 1 deletion Documentation/rev-list-options.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ ordering and formatting options, such as `--reverse`.
`-<number>`::
`-n <number>`::
`--max-count=<number>`::
Limit the output to _<number>_ commits.
Limit the output to the first _<number>_ commits that would be shown.

`--max-count-oldest=<number>`::
Limit the output to the last _<number>_ commits that would be shown.

`--skip=<number>`::
Skip _<number>_ commits before starting to show the commit output.
Expand Down
6 changes: 3 additions & 3 deletions Documentation/technical/build-systems.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Auto-detection of the following items is considered to be important:

- Check for the existence of headers.
- Check for the existence of libraries.
- Check for the existence of exectuables.
- Check for the existence of executables.
- Check for the runtime behavior of specific functions.
- Check for specific link order requirements when multiple libraries are
involved.
Expand Down Expand Up @@ -106,7 +106,7 @@ by the build system:

- C: the primary compiled language used by Git, must be supported. Relevant
toolchains are GCC, Clang and MSVC.
- Rust: candidate as a second compiled lanugage, should be supported. Relevant
- Rust: candidate as a second compiled language, should be supported. Relevant
toolchains is the LLVM-based rustc.

Built-in support for the respective languages is preferred over support that
Expand Down Expand Up @@ -142,7 +142,7 @@ The following list of build systems are considered:

=== GNU Make

- Platform support: ubitquitous on all platforms, but not well-integrated into Windows.
- Platform support: ubiquitous on all platforms, but not well-integrated into Windows.
- Auto-detection: no built-in support for auto-detection of features.
- Ease of use: easy to use, but discovering available options is hard. Makefile
rules can quickly get out of hand once reaching a certain scope.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/technical/hash-function-transition.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ Alternates
~~~~~~~~~~
For the same reason, a SHA-256 repository cannot borrow objects from a
SHA-1 repository using objects/info/alternates or
$GIT_ALTERNATE_OBJECT_REPOSITORIES.
$GIT_ALTERNATE_OBJECT_DIRECTORIES.

git notes
~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

DEF_VER=v2.55.0-rc0
DEF_VER=v2.55.0-rc1

LF='
'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4098,7 +4098,7 @@ contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT)

contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) GIT-LDFLAGS
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
$(filter %.o,$^) $(LIB_FILE) $(EXTLIBS) -framework Security -framework CoreFoundation
$(filter %.o,$^) $(LIBS) -framework Security -framework CoreFoundation

contrib/credential/osxkeychain/git-credential-osxkeychain.o: contrib/credential/osxkeychain/git-credential-osxkeychain.c GIT-CFLAGS
$(QUIET_LINK)$(CC) -o $@ -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
Expand Down
Loading
Loading