Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1083 commits
Select commit Hold shift + click to select a range
931338a
vcpkg_install: add comment regarding slow network connections
PhilipOakley Oct 6, 2019
e6acdd1
vcbuild: add an option to install individual 'features'
manbearian Feb 4, 2020
9fda288
CMake: default Visual Studio generator has changed
PhilipOakley Jul 1, 2021
20de789
cmake: allow building for Windows/ARM64
dennisameling Dec 4, 2020
550b46c
.gitignore: add Visual Studio CMakeSetting.json file
PhilipOakley Apr 24, 2021
d4e722e
hash-object: demonstrate a >4GB/LLP64 problem
PhilipOakley Oct 31, 2021
a44c79e
ci(vs-build) also build Windows/ARM64 artifacts
dennisameling Nov 28, 2020
45df834
subtree: update `contrib/subtree` `test` target
vdye Aug 5, 2021
55e8c83
CMakeLists: add default "x64-windows" arch for Visual Studio
PhilipOakley Apr 22, 2021
8ff63d6
object-file.c: use size_t for header lengths
PhilipOakley Nov 12, 2021
da208ad
Add schannel to curl installation
dennisameling Dec 6, 2020
a0adc6f
cmake(): allow setting HOST_CPU for cross-compilation
dennisameling Jul 19, 2021
bd3f9ea
mingw: allow for longer paths in `parse_interpreter()`
dscho Apr 2, 2021
37283dd
compat/vcbuild: document preferred way to build in Visual Studio
dscho May 17, 2021
1fa945c
http: optionally send SSL client certificate
pascalmuller Jun 23, 2021
8f7d41a
ci: run `contrib/subtree` tests in CI builds
vdye Aug 5, 2021
da65821
CMake: show Win32 and Generator_platform build-option values
PhilipOakley May 10, 2021
7918e8f
hash algorithms: use size_t for section lengths
PhilipOakley Nov 12, 2021
07fa716
hash-object --stdin: verify that it works with >4GB/LLP64
PhilipOakley Dec 6, 2021
5821584
hash-object: add another >4GB/LLP64 test case
PhilipOakley Dec 6, 2021
1f00fb3
setup: properly use "%(prefix)/" when in WSL
derrickstolee Apr 13, 2022
dc70a99
hash-object: add a >4GB/LLP64 test case using filtered input
PhilipOakley Dec 7, 2021
7e59f5f
compat/mingw.c: do not warn when failing to get owner
derrickstolee Apr 13, 2022
2c544d2
mingw: $env:TERM="xterm-256color" for newer OSes
rkitover Apr 12, 2022
3a40e80
winansi: check result and Buffer before using Name
1480c1 May 28, 2022
0e9db30
Add config option `windows.appendAtomically`
sunzhuoshi Jan 15, 2022
98f17d2
mingw: change core.fsyncObjectFiles = 1 by default
dscho Sep 4, 2017
da26259
MinGW: link as terminal server aware
rimrul Jul 10, 2022
6db5111
Fix Windows version resources
Mortein Nov 2, 2022
eefca7d
status: fix for old-style submodules with commondir
sceptical-coder Oct 28, 2022
7ad040c
mingw: stop hard-coding `CC = gcc`
dscho Nov 23, 2025
7c99531
mingw: drop the -D_USE_32BIT_TIME_T option
dscho Nov 21, 2025
9968a5a
mingw: only use -Wl,--large-address-aware for 32-bit builds
dscho Nov 21, 2025
8551b75
mingw: avoid over-specifying `--pic-executable`
dscho Nov 21, 2025
e6ef60d
mingw: set the prefix and HOST_CPU as per MSYS2's settings
dscho Nov 21, 2025
ce9edb7
Merge branch 'dscho-avoid-d-f-conflict-in-vs-master'
dscho Apr 13, 2021
2247b4a
mingw: only enable the MSYS2-specific stuff when compiling in MSYS2
dscho Nov 21, 2025
7662c98
clink.pl: fix libexpatd.lib link error when using MSVC
jeffhostetler Mar 30, 2021
6603cd0
mingw: rely on MSYS2's metadata instead of hard-coding it
dscho Nov 21, 2025
bbece75
mingw: ensure valid CTYPE
dscho Feb 21, 2017
5031072
Makefile: clean up .ilk files when MSVC=1
jeffhostetler Apr 5, 2021
363d1e3
mingw: always define `ETC_*` for MSYS2 environments
dscho Nov 21, 2025
8460b86
mingw: allow `git.exe` to be used instead of the "Git wrapper"
dscho Jan 31, 2020
5d0db36
vcbuild: add support for compiling Windows resource files
jeffhostetler Apr 5, 2021
19dd456
windows: skip linking `git-<command>` for built-ins
dscho Jan 27, 2023
7e228a6
max_tree_depth: lower it for clang builds in general on Windows
dscho Nov 21, 2025
8dd949a
mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system dire…
dscho Aug 25, 2020
4653bf7
config.mak.uname: add git.rc to MSVC builds
jeffhostetler Apr 5, 2021
2b4827a
http: optionally load libcurl lazily
dscho May 6, 2023
1e50e83
clink.pl: ignore no-stack-protector arg on MSVC=1 builds
jeffhostetler Apr 5, 2021
ad919d0
http: support lazy-loading libcurl also on Windows
dscho May 7, 2023
ecc2110
clink.pl: move default linker options for MSVC=1 builds
jeffhostetler Apr 5, 2021
7f54b2f
http: when loading libcurl lazily, allow for multiple SSL backends
dscho May 7, 2023
4f834cf
cmake: install headless-git.
Berrysoft Mar 11, 2023
8d4e381
git.rc: include winuser.h
rimrul Dec 2, 2023
5e7aecd
mingw: do load libcurl dynamically by default
dscho May 7, 2023
0aef3ce
Add a GitHub workflow to verify that Git/Scalar work in Nano Server
dscho Nov 2, 2022
363890f
mingw: suggest `windows.appendAtomically` in more cases
dsl101 Jul 28, 2023
b4898c4
survey: stub in new experimental 'git-survey' command
Apr 29, 2024
1d719bf
survey: add command line opts to select references
Apr 29, 2024
f13ffd0
survey: start pretty printing data in table form
derrickstolee Sep 1, 2024
dd88cf8
survey: add object count summary
derrickstolee Sep 2, 2024
288ae6c
survey: summarize total sizes by object type
derrickstolee Sep 2, 2024
c0e7b85
survey: show progress during object walk
derrickstolee Sep 2, 2024
39d3602
win32: use native ANSI sequence processing, if possible
dscho Nov 22, 2023
726b538
common-main.c: fflush stdout buffer upon exit
chengzhuo5 Apr 8, 2024
77f8f37
t5601/t7406(mingw): do run tests with symlink support
dscho Apr 9, 2024
105df30
win32: ensure that `localtime_r()` is declared even in i686 builds
dscho May 21, 2024
067395b
Fallback to AppData if XDG_CONFIG_HOME is unset
ariellourenco Jul 2, 2024
17a1cfd
run-command: be helpful with Git LFS fails on Windows 7
dscho Jul 4, 2024
07d8e26
revision: create mark_trees_uninteresting_dense()
derrickstolee Sep 6, 2024
639ba81
ci: work around a problem with HTTP/2 vs libcurl v8.10.0
dscho Sep 24, 2024
d462e00
mingw: make sure `errno` is set correctly when socket operations fail
dscho Nov 14, 2019
1930def
survey: add ability to track prioritized lists
derrickstolee Sep 2, 2024
d623629
compat/mingw: handle WSA errors in strerror
rimrul Dec 22, 2024
1c27023
t5563: verify that NTLM authentication works
dscho Nov 26, 2025
795f5dc
survey: add report of "largest" paths
derrickstolee Sep 2, 2024
c82a9f4
compat/mingw: drop outdated comment
rimrul Dec 22, 2024
9affb87
http: disallow NTLM authentication by default
dscho Nov 26, 2025
f303c99
survey: add --top=<N> option and config
derrickstolee Sep 23, 2024
1d9c888
t0301: actually test credential-cache on Windows
rimrul Dec 29, 2024
5612c83
http: warn if might have failed because of NTLM
dscho Nov 26, 2025
dec8ec7
survey: clearly note the experimental nature in the output
dscho Jul 1, 2024
3d8351f
credential-cache: handle ECONNREFUSED gracefully
rimrul Dec 22, 2024
bf05a58
reftable: do make sure to use custom allocators
dscho Mar 6, 2025
dfa6a7c
check-whitespace: avoid alerts about upstream commits
dscho Jun 3, 2025
a1bd514
t/t5571-prep-push-hook.sh: Add test with writing to stderr
t-b Jan 26, 2026
13a251f
Merge 'remote-hg-prerequisites' into HEAD
dscho Jun 8, 2018
4fe4716
Merge branch 'drive-prefix'
dscho Jun 8, 2018
0042443
Merge branch 'dont-clean-junctions'
dscho Jul 30, 2019
21503ae
Merge branch 'msys2-python'
dscho May 31, 2019
75d09c7
credential: advertise NTLM suppression and allow helpers to re-enable
dscho Feb 9, 2026
a47dcfd
mingw: use strftime() directly in UCRT builds
dscho Mar 17, 2026
b93f3c7
dir: do not traverse mount points
maks244 Mar 30, 2026
777fcc3
Update mimalloc to v2.2.7 (#6048)
dscho Jan 19, 2026
3e96f03
Merge pull request #2375 from assarbad/reintroduce-sideband-config
dscho Oct 30, 2019
b7c8d81
Merge pull request #2488 from bmueller84/master
dscho Jan 22, 2020
1754840
Merge pull request #2501 from jeffhostetler/clink-debug-curl
dscho Jan 30, 2020
82f3452
Merge pull request #2504 from dscho/access-repo-via-junction
dscho Feb 1, 2020
a682fc6
Merge pull request #2535 from dscho/schannel-revoke-best-effort
dscho Mar 4, 2020
a9d24b0
Merge pull request #2618 from dscho/avoid-d/f-conflict-in-vs/master
dscho May 9, 2020
1047902
Merge 'add-p-many-files'
dscho Jun 8, 2018
a81b89d
Merge pull request #2714 from lbonanomi/crlf-scissors
dscho Jul 3, 2020
c024ff7
Merge pull request #2655 from jglathe/jg/t0014_trace_extra_info
dscho Oct 9, 2020
c464bb9
Merge 'git-gui/js/intent-to-add'
dscho Oct 18, 2020
2060443
Merge pull request #2351 from PhilipOakley/vcpkg-tip
dscho Oct 7, 2019
069db6e
Merge pull request #2915 from dennisameling/windows-arm64-support
dscho Dec 9, 2020
0c2086f
Merge pull request #3327 from dennisameling/fix-host-cpu
dscho Jul 19, 2021
1952236
Merge pull request #3165 from dscho/increase-allowed-length-of-interp…
dscho Apr 3, 2021
de5eb58
Merge pull request #3220 from dscho/there-is-no-vs/master-anymore
dscho May 17, 2021
aebc25b
Merge pull request #3293 from pascalmuller/http-support-automatically…
dscho Jun 24, 2021
ed52478
Merge pull request #3349 from vdye/feature/ci-subtree-tests
dscho Aug 10, 2021
0e9cad2
Merge pull request #3306 from PhilipOakley/vs-sln
dscho Oct 12, 2021
b417a00
Merge pull request #3533 from PhilipOakley/hashliteral_t
dscho Dec 15, 2021
5eb2de3
Merge pull request #3791: Various fixes around `safe.directory`
derrickstolee Apr 13, 2022
fdac7d7
Merge pull request #3751 from rkitover/native-term
dscho Apr 21, 2022
7f0d049
Merge pull request #3875 from 1480c1/wine/detect_msys_tty
dscho May 30, 2022
9f3d526
Merge branch 'optionally-dont-append-atomically-on-windows'
dscho Jun 23, 2022
670f832
Merge branch 'fsync-object-files-always'
dscho Oct 11, 2018
3d6d8e4
Merge pull request #3942 from rimrul/mingw-tsaware
dscho Jul 27, 2022
f845fda
Fix Windows version resources (#4092)
dscho Nov 3, 2022
ef26220
Fix global repository field not being cleared (#4083)
dscho Dec 20, 2022
c2d2e8b
Skip linking the "dashed" `git-<command>`s for built-ins (#4252)
dscho Jan 31, 2023
9bf457c
Add full `mingw-w64-git` (i.e. regular MSYS2 ecosystem) support (#5971)
dscho Nov 25, 2025
e4e026e
Merge pull request #2506 from dscho/issue-2283
dscho Feb 11, 2020
041ac64
Merge pull request #2974 from derrickstolee/maintenance-and-headless
dscho Jan 11, 2021
47b1c3c
ARM64: Embed manifest properly (#4718)
dscho Dec 7, 2023
af52e5b
Lazy load libcurl, allowing for an SSL/TLS backend-specific libcurl (…
dscho May 15, 2023
0ade1e8
Merge branch 'nano-server'
dscho Aug 7, 2023
de5be60
Additional error checks for issuing the windows.appendAtomically warn…
dscho Aug 7, 2023
8f0cdea
win32: use native ANSI sequence processing, if possible (#4700)
dscho Dec 2, 2023
95446c3
common-main.c: fflush stdout buffer when exit (#4901)
dscho Apr 12, 2024
6619dae
Merge branch 'run-t5601-and-t7406-with-symlinks-on-windows-10'
dscho Jul 12, 2024
ec0e312
Merge branch 'Fix-i686-build-with-GCC-v14'
dscho Jul 12, 2024
33dd150
Merge branch 'Fallback-to-AppData-if-XDG-CONFIG-HOME-is-unset'
dscho Jul 12, 2024
e8f27dc
Merge branch 'run-command-be-helpful-when-Git-LFS-fails-on-Windows-7'
dscho Jul 12, 2024
4e13bc3
pack-objects: create new name-hash algorithm (#5157)
dscho Sep 24, 2024
13091e8
Add path walk API and its use in 'git pack-objects' (#5171)
derrickstolee Sep 25, 2024
5c2f93c
Add experimental 'git survey' builtin (#5174)
dscho Sep 26, 2024
95a1839
credential-cache: handle ECONNREFUSED gracefully (#5329)
dscho Jan 1, 2025
a353811
Merge branch 'reftable-vs-custom-allocators'
dscho Jun 2, 2025
3ca2f1b
Merge branch 'check-whitespace-only-downstream'
dscho Jun 3, 2025
dd513cb
t/t5571-prep-push-hook.sh: Add test with writing to stderr (#6063)
dscho Jan 27, 2026
5f2c53b
Merge branch 'disallow-ntlm-auth-by-default'
dscho Feb 12, 2026
6965864
mingw: use strftime() directly in UCRT builds (#6130)
dscho Mar 25, 2026
c9e5f71
Don't traverse mount points in `remove_dir_recurse()` (#6151)
dscho Mar 31, 2026
ccb6ce4
Merge branch 'ready-for-upstream'
dscho Oct 11, 2018
ff97fec
Win32: make FILETIME conversion functions public
kblees Jul 6, 2013
60aed93
Win32: dirent.c: Move opendir down
kblees Sep 8, 2013
67a5395
mingw: make the dirent implementation pluggable
kblees Sep 8, 2013
3f0d3c5
Win32: make the lstat implementation pluggable
kblees Sep 8, 2013
6144194
mingw: add infrastructure for read-only file system level caches
kblees Sep 8, 2013
9d0813f
git-gui--askyesno: fix funny text wrapping
dscho Sep 20, 2017
580aee5
mingw: add a cache below mingw's lstat and dirent implementations
kblees Oct 1, 2013
2a8f933
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho Sep 20, 2017
3b8f7fa
ci(macos): skip the `git p4` tests
dscho Nov 13, 2025
861d981
fscache: load directories only once
kblees Jun 24, 2014
aef6415
Merge branch 'git-gui-askyesno'
dscho Jun 8, 2018
2f45fc8
ci(macos): skip the `git p4` tests (#5954)
dscho Nov 14, 2025
448749b
fscache: add key for GIT_TRACE_FSCACHE
jeffhostetler Jan 24, 2017
82d09a9
fscache: remember not-found directories
jeffhostetler Dec 13, 2016
8b6c3cc
fscache: add a test for the dir-not-found optimization
dscho Jan 25, 2017
486873c
add: use preload-index and fscache for performance
jeffhostetler Nov 22, 2016
111ac06
dir.c: make add_excludes aware of fscache during status
jeffhostetler Nov 1, 2017
6cfa7ae
fscache: make fscache_enabled() public
jeffhostetler Dec 20, 2017
5a24cbb
dir.c: regression fix for add_excludes with fscache
jeffhostetler Dec 20, 2017
be7243c
fetch-pack.c: enable fscache for stats under .git/objects
Nov 22, 2017
c97953a
checkout.c: enable fscache for checkout again
Jan 30, 2018
ad44d84
Enable the filesystem cache (fscache) in refresh_index().
benpeart Sep 7, 2018
dfb3c53
fscache: use FindFirstFileExW to avoid retrieving the short name
benpeart Oct 23, 2018
0bdb2cf
mem_pool: add GIT_TRACE_MEMPOOL support
benpeart Oct 4, 2018
22b8267
fscache: add GIT_TEST_FSCACHE support
benpeart Oct 4, 2018
621be54
fscache: fscache takes an initial size
benpeart Nov 2, 2018
9d416ef
fscache: add fscache hit statistics
benpeart Sep 25, 2018
9e00f99
fscache: update fscache to be thread specific instead of global
benpeart Oct 4, 2018
90970d9
unpack-trees: enable fscache for sparse-checkout
derrickstolee Jun 12, 2019
6409d56
status: disable and free fscache at the end of the status command
benpeart Nov 1, 2018
4773626
fscache: teach fscache to use mempool
benpeart Nov 2, 2018
1e93c8b
fscache: remember the reparse tag for each entry
dscho Dec 11, 2018
44df3c4
fscache: make fscache_enable() thread safe
benpeart Nov 16, 2018
07b41f3
Merge branch 'fscache'
dscho Nov 15, 2018
c9dd4fb
fscache: implement an FSCache-aware is_mount_point()
dscho Dec 11, 2018
e8cfdf1
fscache: teach fscache to use NtQueryDirectoryFile
benpeart Nov 15, 2018
9dd9966
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho Nov 5, 2018
8bd9d50
clean: make use of FSCache
dscho Dec 11, 2018
f2ad835
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho Nov 16, 2018
02821b0
Merge branch 'dont-clean-junctions-fscache'
dscho Jul 23, 2019
adadbb5
pack-objects (mingw): demonstrate a segmentation fault with large deltas
vangdfang Jan 9, 2014
17d3187
mingw: support long paths
kblees Jul 28, 2015
eadec2d
mingw: introduce code to detect whether we're inside a Windows container
zcube Apr 23, 2018
faf8168
win32(long path support): leave drive-less absolute paths intact
dscho Sep 6, 2023
ec67885
mingw: Support `git_terminal_prompt` with more terminals
kblees Mar 19, 2015
9ba7444
mingw: when running in a Windows container, try to rename() harder
zcube Apr 23, 2018
3763a6b
compat/fsmonitor/fsm-*-win32: support long paths
jeffhostetler Mar 25, 2022
df7032d
compat/terminal.c: only use the Windows console if bash 'read -r' fails
kblees May 9, 2015
fa9b834
mingw: move the file_attr_to_st_mode() function definition
zcube Apr 23, 2018
598fe6b
clean: suggest using `core.longPaths` if paths are too long to remove
mathstuf Apr 22, 2022
beb26cd
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho Feb 23, 2018
f773ee6
mingw: Windows Docker volumes are *not* symbolic links
dscho Apr 23, 2018
98ef286
mingw: explicitly specify with which cmd to prefix the cmdline
dscho Jul 20, 2017
4542c7d
mingw: when path_lookup() failed, try BusyBox
dscho Jul 20, 2017
c78b42d
test-tool: learn to act as a drop-in replacement for `iconv`
dscho Jul 20, 2017
3f0d0b8
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho Jul 20, 2017
5429073
gitattributes: mark .png files as binary
dscho Oct 11, 2018
eec1e68
tests: move test PNGs into t/lib-diff/
dscho Aug 5, 2017
2a55a1b
Win32: symlink: move phantom symlink creation to a separate function
piscisaureus Oct 26, 2018
fc233c3
tests: only override sort & find if there are usable ones in /usr/bin/
dscho Jul 17, 2017
11a294f
Introduce helper to create symlinks that knows about index_state
dscho Feb 11, 2019
5d98c34
tests: use the correct path separator with BusyBox
dscho Nov 19, 2018
83e41f0
mingw: allow to specify the symlink type in .gitattributes
piscisaureus Oct 26, 2018
02882f8
mingw: only use Bash-ism `builtin pwd -W` when available
dscho Jun 29, 2017
81456c0
mingw: work around rename() failing on a read-only file
dsl101 Jul 28, 2023
3371f54
Win32: symlink: add test for `symlink` attribute
piscisaureus Oct 26, 2018
9864990
tests (mingw): remove Bash-specific pwd option
dscho Jun 30, 2017
3b75e32
test-lib: add BUSYBOX prerequisite
dscho Jul 19, 2017
472e2ad
t5003: use binary file from t/lib-diff/
dscho Aug 5, 2017
4772e27
t5532: workaround for BusyBox on Windows
dscho Jul 21, 2017
f2c4668
t5605: special-case hardlink test for BusyBox-w32
dscho Jul 21, 2017
566ab3c
t5813: allow for $PWD to be a Windows path
dscho Jul 5, 2017
0f22b67
mingw: kill child processes in a gentler way
dscho May 17, 2017
d748035
t9200: skip tests when $PWD contains a colon
dscho Jul 7, 2017
d1e78a1
mingw: optionally enable wsl compability file mode bits
swigger Jun 7, 2023
a5c2baa
mingw: really handle SIGINT
dscho Apr 22, 2018
57557b4
Partially un-revert "editor: save and reset terminal after calling ED…
dscho Nov 25, 2021
26d2f52
Describe Git for Windows' architecture [no ci]
dscho Feb 13, 2023
14acb60
Modify the Code of Conduct for Git for Windows
dscho Oct 11, 2019
c060827
CONTRIBUTING.md: add guide for first-time contributors
derrickstolee Mar 1, 2018
9d20a0f
README.md: Add a Windows-specific preamble
dscho Jan 10, 2014
bb67eb5
Add an issue template
shiftkey Feb 18, 2016
9da95d9
Add a GitHub workflow to monitor component updates
dscho Sep 29, 2020
471eb8e
Modify the GitHub Pull Request template (to reflect Git for Windows)
Dec 22, 2017
4281512
Merge branch 'gitk-and-git-gui-patches'
dscho Oct 11, 2018
3e94fd6
reset: reinstate support for the deprecated --stdin option
dscho Dec 10, 2019
70f0dfc
fsmonitor: reintroduce core.useBuiltinFSMonitor
vdye Apr 4, 2022
9bbffaa
dependabot: help keeping GitHub Actions versions up to date
dscho Feb 6, 2024
42dd91b
SECURITY.md: document Git for Windows' policies
dscho Aug 23, 2019
4ff561f
Merge branch 'long-paths'
dscho Nov 15, 2018
2927d77
Merge branch 'msys2'
dscho Nov 15, 2018
e401432
Merge 'docker-volumes-are-no-symlinks'
dscho Oct 12, 2018
44cc0ef
mingw: try resetting the read-only bit if rename fails (#4527)
dscho Aug 7, 2023
6402d72
Merge pull request #1897 from piscisaureus/symlink-attr
dscho Oct 31, 2018
6f5938b
Merge branch 'busybox-w32'
dscho Feb 7, 2019
96c87c2
Merge branch 'wsl-file-mode-bits'
dscho Aug 7, 2023
e9edd90
Merge pull request #1170 from dscho/mingw-kill-process
dscho Oct 11, 2018
086cd1a
Merge branch 'un-revert-editor-save-and-reset'
dscho Jan 15, 2022
1dc36e5
Merge branch 'phase-out-reset-stdin'
dscho Jun 8, 2018
9601ac3
Merge branch 'deprecate-core.useBuiltinFSMonitor'
dscho Jan 24, 2023
a2b6034
Merge pull request #2837 from dscho/monitor-component-updates
dscho Oct 7, 2020
c753820
Merge 'readme' into HEAD
dscho Jun 7, 2018
a2409ca
cmake: use writev(3p) wrapper as needed
dscho Apr 2, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ insert_final_newline = true
indent_style = tab
tab_width = 8

[templates/hooks/*.sample]
indent_style = tab
tab_width = 8

[*.py]
indent_style = space
indent_size = 4
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ CODE_OF_CONDUCT.md -whitespace
/Documentation/user-manual.adoc conflict-marker-size=32
/t/t????-*.sh conflict-marker-size=32
/t/unit-tests/clar/test/expected/* whitespace=-blank-at-eof
/templates/hooks/*.sample whitespace=indent,trail,space,incomplete text eol=lf
3 changes: 2 additions & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ conveniently send your Pull Requests commits to our mailing list.

Please read ["A note from the maintainer"](https://git.kernel.org/pub/scm/git/git.git/plain/MaintNotes?h=todo)
to learn how the Git project is managed, and how you can work with it.
In addition, we highly recommend you to read [our submission guidelines](../Documentation/SubmittingPatches).
In addition, we highly recommend you to read
[our submission guidelines](https://git-scm.com/docs/SubmittingPatches).

If you prefer video, then [this talk](https://www.youtube.com/watch?v=Q7i_qQW__q4&feature=youtu.be&t=6m4s)
might be useful to you as the presenter walks you through the contribution
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
- uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: test
shell: bash
run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
run: . /etc/profile && ci/run-test-slice.sh $((${{matrix.nr}} + 1)) 10
- name: print test failures
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
shell: bash
Expand Down Expand Up @@ -240,7 +240,7 @@ jobs:
shell: bash
env:
NO_SVN_TESTS: 1
run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
run: . /etc/profile && ci/run-test-slice.sh $((${{matrix.nr}} + 1)) 10
- name: print test failures
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
shell: bash
Expand Down Expand Up @@ -300,8 +300,8 @@ jobs:
name: windows-meson-artifacts
path: build
- name: Test
shell: pwsh
run: ci/run-test-slice-meson.sh build ${{matrix.nr}} 10
shell: bash
run: ci/run-test-slice-meson.sh build $((${{matrix.nr}} + 1)) 10
- name: print test failures
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
shell: bash
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
/git-grep
/git-hash-object
/git-help
/git-history
/git-hook
/git-http-backend
/git-http-fetch
Expand Down
23 changes: 18 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ test:osx:
parallel:
matrix:
- jobname: osx-clang
image: macos-14-xcode-15
image: macos-15-xcode-16
CC: clang
- jobname: osx-reftable
image: macos-14-xcode-15
image: macos-15-xcode-16
CC: clang
- jobname: osx-meson
image: macos-14-xcode-15
image: macos-15-xcode-16
CC: clang
artifacts:
paths:
Expand Down Expand Up @@ -157,19 +157,22 @@ test:mingw64:
parallel: 10

.msvc-meson:
variables:
TEST_OUTPUT_DIRECTORY: "C:/Git-Test"
tags:
- saas-windows-medium-amd64
before_script:
- *windows_before_script
- choco install -y git meson ninja rust-ms
- Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
- refreshenv
- New-Item -Path $env:TEST_OUTPUT_DIRECTORY -ItemType Directory

build:msvc-meson:
extends: .msvc-meson
stage: build
script:
- meson setup build --vsenv -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred
- meson setup build --vsenv -Dperl=disabled -Dbackend_max_links=1 -Dcredential_helpers=wincred -Dtest_output_directory="$TEST_OUTPUT_DIRECTORY"
- meson compile -C build
artifacts:
paths:
Expand All @@ -183,11 +186,21 @@ test:msvc-meson:
- job: "build:msvc-meson"
artifacts: true
script:
- meson test -C build --no-rebuild --print-errorlogs --slice $Env:CI_NODE_INDEX/$Env:CI_NODE_TOTAL
- |
& "C:/Program Files/Git/usr/bin/bash.exe" -l -c 'ci/run-test-slice-meson.sh build $CI_NODE_INDEX $CI_NODE_TOTAL'
after_script:
- |
if ($env:CI_JOB_STATUS -ne "success") {
& "C:/Program Files/Git/usr/bin/bash.exe" -l -c 'ci/print-test-failures.sh'
Move-Item -Path "$env:TEST_OUTPUT_DIRECTORY/failed-test-artifacts" -Destination t/
}
parallel: 10
artifacts:
paths:
- t/failed-test-artifacts
reports:
junit: build/meson-logs/testlog.junit.xml
when: on_failure

test:fuzz-smoke-tests:
image: ubuntu:latest
Expand Down
4 changes: 3 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,8 @@ Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
Petr Baudis <pasky@ucw.cz> <xpasky@machine>
Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
Phil Hord <phil.hord@gmail.com> <hordp@cisco.com>
Phil Hord <phil.hord@gmail.com> <phord@purestorage.com>
Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk>
Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
Expand Down Expand Up @@ -282,6 +283,7 @@ Thomas Ackermann <th.acker@arcor.de> <th.acker66@arcor.de>
Thomas Rast <tr@thomasrast.ch> <trast@student.ethz.ch>
Thomas Rast <tr@thomasrast.ch> <trast@inf.ethz.ch>
Thomas Rast <tr@thomasrast.ch> <trast@google.com>
Tian Yuchen <cat@malon.dev> <a3205153416@gmail.com>
Timo Hirvonen <tihirvon@gmail.com> <tihirvon@ee.oulu.fi>
Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
Tom Grennan <tmgrennan@gmail.com> <tgrennan@redback.com>
Expand Down
25 changes: 25 additions & 0 deletions Documentation/CodingGuidelines
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ Git in general, a few rough rules are:
achieve and why the changes were necessary (more on this in the
accompanying SubmittingPatches document).

- A label "NEEDSWORK:" followed by a description of the things to
be done is a way to leave in-code comments to document design
decisions yet to be made. 80% of the work to resolve a NEEDSWORK
comment is to decide if it still makes sense to do so, since the
situation around the codebase may have changed since the comment
was written. It can be a very valid change to remove an existing
NEEDSWORK comment without doing anything else, with the commit log
message describing a good argument why it does not make sense to do
the thing the NEEDSWORK comment mentioned.

Make your code readable and sensible, and don't try to be clever.

As for more concrete guidelines, just imitate the existing code
Expand Down Expand Up @@ -430,6 +440,8 @@ For C programs:
*/
_("Here is a translatable string explained by the above.");

We do not use // comments.

- Double negation is often harder to understand than no negation
at all.

Expand Down Expand Up @@ -656,6 +668,19 @@ For C programs:
unsigned other_field:1;
unsigned field_with_longer_name:1;

- Array names should be named in the singular form if the individual items are
subject of use. E.g.:

char *dog[] = ...;
walk_dog(dog[0]);
walk_dog(dog[1]);

Cases where the array is employed as a whole rather than as its unit parts,
the plural forms is preferable. E.g:

char *dogs[] = ...;
walk_all_dogs(dogs);

For Perl programs:

- Most of the C guidelines above apply.
Expand Down
17 changes: 10 additions & 7 deletions Documentation/MyFirstContribution.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,8 @@ on the command line, including the name of our command. (If `prefix` is empty
for you, try `cd Documentation/ && ../bin-wrappers/git psuh`). That's not so
helpful. So what other context can we get?

Add a line to `#include "config.h"` and `#include "repository.h"`.
Add a line to `#include "config.h"`, `#include "repository.h"` and
`#include "environment.h"`.
Then, add the following bits to the function body:
function body:

Expand All @@ -351,7 +352,7 @@ function body:
apply standard precedence rules. `repo_config_get_string_tmp()` will look up
a specific key ("user.name") and give you the value. There are a number of
single-key lookup functions like this one; you can see them all (and more info
about how to use `repo_config()`) in `Documentation/technical/api-config.adoc`.
about how to use `repo_config()`) in `config.h`.

You should see that the name printed matches the one you see when you run:

Expand Down Expand Up @@ -429,6 +430,7 @@ Add the following includes:
----
#include "commit.h"
#include "pretty.h"
#include "strbuf.h"
----

Then, add the following lines within your implementation of `cmd_psuh()` near
Expand Down Expand Up @@ -503,8 +505,8 @@ git-psuh - Delight users' typo with a shy horse

SYNOPSIS
--------
[verse]
'git-psuh [<arg>...]'
[synopsis]
git psuh [<arg>...]

DESCRIPTION
-----------
Expand Down Expand Up @@ -726,9 +728,10 @@ $ prove -j$(nproc) --shuffle t[0-9]*.sh
----

NOTE: You can also do this with `make test` or use any testing harness which can
speak TAP. `prove` can run concurrently. `shuffle` randomizes the order the
tests are run in, which makes them resilient against unwanted inter-test
dependencies. `prove` also makes the output nicer.
speak TAP. `prove` can run concurrently. `-j$(nproc)` runs tests using all
available CPUs in parallel, but the job count can be adjusted as needed.
`shuffle` randomizes the order the tests are run in, which makes them resilient
against unwanted inter-test dependencies. `prove` also makes the output nicer.

Go ahead and commit this change, as well.

Expand Down
Loading
Loading