forked from git-for-windows/git
-
Notifications
You must be signed in to change notification settings - Fork 103
Rebase to v2.51.0 #785
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
Merged
Merged
Rebase to v2.51.0 #785
Changes from 1 commit
Commits
Show all changes
305 commits
Select commit
Hold shift + click to select a range
5d7f1c8
status: serialize to path
jeffhostetler c89c8a3
status: reject deserialize in V2 and conflicts
jeffhostetler fd3fa17
gvfs: verify that the built-in FSMonitor is disabled
dscho ae20a35
serialize-status: serialize global and repo-local exclude file metadata
jeffhostetler ae207a6
wt-status: add trace2 data for sparse-checkout percentage
jeffhostetler 85f8b88
status: deserialization wait
jeffhostetler 77a05c8
wt-status: add VFS hydration percentage to normal `git status` output
jeffhostetler e3eb163
gvfs:trace2:data: add trace2 tracing around read_object_process
jeffhostetler 283754f
status: deserialize with -uno does not print correct hint
jeffhostetler 6271e7d
gvfs:trace2:data: status deserialization information
jeffhostetler b854957
fsmonitor: check CE_FSMONITOR_VALID in ce_uptodate
kewillford f2f8e77
gvfs:trace2:data: status serialization
jeffhostetler bc9d170
fsmonitor: add script for debugging and update script for tests
kewillford 7f640d8
gvfs:trace2:data: add vfs stats
jeffhostetler b317deb
status: disable deserialize when verbose output requested.
jeffhostetler 816d456
trace2: refactor setting process starting time
jeffhostetler c748348
t7524: add test for verbose status deserialzation
jeffhostetler 5765d2d
trace2:gvfs:experiment: clear_ce_flags_1
jeffhostetler da00afe
deserialize-status: silently fallback if we cannot read cache file
jeffhostetler 12606fb
trace2:gvfs:experiment: report_tracking
jeffhostetler 2b62302
trace2:gvfs:experiment: read_cache: annotate thread usage in read-cache
jeffhostetler 4998f1e
trace2:gvfs:experiment: read-cache: time read/write of cache-tree ext…
jeffhostetler ecb63bb
trace2:gvfs:experiment: add region to apply_virtualfilesystem()
jeffhostetler 19bd4ef
trace2:gvfs:experiment: add region around unpack_trees()
jeffhostetler 037de62
trace2:gvfs:experiment: add region to cache_tree_fully_valid()
jeffhostetler b7dfb3e
trace2:gvfs:experiment: add unpack_entry() counter to unpack_trees() …
jeffhostetler fba6d9c
credential: set trace2_child_class for credential manager children
jeffhostetler 16ed1ac
trace2:gvfs:experiment: increase default event depth for unpack-tree …
jeffhostetler e64d4da
sub-process: do not borrow cmd pointer from caller
jeffhostetler fb4f5ff
trace2:gvfs:experiment: add data for check_updates() in unpack_trees()
jeffhostetler 0e5b181
sub-process: add subprocess_start_argv()
jeffhostetler f60deec
Trace2:gvfs:experiment: capture more 'tracking' details
jeffhostetler 12f7afa
sha1-file: add function to update existing loose object cache
jeffhostetler c92a2c6
packfile: add install_packed_git_and_mru()
jeffhostetler 07ccbe9
index-pack: avoid immediate object fetch while parsing packfile
jeffhostetler 87c5076
gvfs-helper: create tool to fetch objects using the GVFS Protocol
jeffhostetler da78e18
sha1-file: create shared-cache directory if it doesn't exist
jeffhostetler a195263
gvfs-helper: better handling of network errors
jeffhostetler 8a883d3
gvfs-helper-client: properly update loose cache with fetched OID
jeffhostetler cbb83f0
gvfs-helper: V2 robust retry and throttling
jeffhostetler 2388db8
gvfs-helper: expose gvfs/objects GET and POST semantics
jeffhostetler 79f28e6
gvfs-helper: dramatically reduce progress noise
derrickstolee 218ea02
gvfs-helper: handle pack-file after single POST request
derrickstolee a55dcac
test-gvfs-prococol, t5799: tests for gvfs-helper
jeffhostetler 0b60864
gvfs-helper: move result-list construction into install functions
jeffhostetler 925542d
t5799: add support for POST to return either a loose object or packfile
jeffhostetler 6773657
t5799: cleanup wc-l and grep-c lines
jeffhostetler 9b3c664
gvfs-helper: verify loose objects after write
derrickstolee 43e9855
gvfs-helper: add prefetch support
jeffhostetler 71616cb
t7599: create corrupt blob test
jeffhostetler 4c2bf79
gvfs-helper: add prefetch .keep file for last packfile
jeffhostetler a9aff75
gvfs-helper: do one read in my_copy_fd_len_tail()
derrickstolee 8ddd012
gvfs-helper: move content-type warning for prefetch packs
derrickstolee e5ad80a
fetch: use gvfs-helper prefetch under config
derrickstolee 90a8c49
gvfs-helper: better support for concurrent packfile fetches
jeffhostetler 4b943d3
remote-curl: do not call fetch-pack when using gvfs-helper
derrickstolee fdf5b90
t5799: explicitly test gvfs-helper --fallback and --no-fallback
jeffhostetler 72e3ce8
fetch: reprepare packs before checking connectivity
derrickstolee 9e9eed1
gvfs-helper: add --max-retries to prefetch verb
jeffhostetler 5ea8127
gvfs-helper: don't fallback with new config
derrickstolee 29e6969
gvfs-helper: retry when creating temp files
derrickstolee 03fcf76
t5799: add tests to detect corrupt pack/idx files in prefetch
jeffhostetler 53dbe72
test-gvfs-protocol: add cache_http_503 to mayhem
jeffhostetler bf00f92
sparse: avoid warnings about known cURL issues in gvfs-helper.c
derrickstolee fef0017
gvfs-helper: ignore .idx files in prefetch multi-part responses
jeffhostetler d65eea4
t5799: add unit tests for new `gvfs.fallback` config setting
jeffhostetler 7eb56c8
homebrew: add GitHub workflow to release Cask
mjcheetham 57124c3
Disable the `monitor-components` workflow in msft-git
dscho 6b8ae45
.github/actions/akv-secret: add action to get secrets
mjcheetham d9b2dcd
maintenance: care about gvfs.sharedCache config
derrickstolee e29d04e
unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags
neerajsi-msft2 0f8e14f
Adding winget workflows
0431002
.github: enable windows builds on microsoft fork
derrickstolee 5ac788d
release: create initial Windows installer build workflow
vdye 85a2780
release: create initial Windows installer build workflow
mjcheetham a0e80d0
help: special-case HOST_CPU `universal`
jeffhostetler ddc2bca
release: add Mac OSX installer build
vdye 13f92e0
release: build unsigned Ubuntu .deb package
vdye e8b80df
release: add signing step for .deb package
vdye 7dcec35
release: create draft GitHub release with packages & installers
vdye 9308b72
dist: archive HEAD instead of HEAD^{tree}
vdye 73168c4
build-git-installers: publish gpg public key
ldennington 8ee6938
release: include GIT_BUILT_FROM_COMMIT in MacOS build
vdye 4d9a7d8
release: continue pestering until user upgrades
derrickstolee 531fc95
release: add installer validation
ldennington 3ede924
update-microsoft-git: create barebones builtin
derrickstolee dd6be5c
.github: reinstate ISSUE_TEMPLATE.md for microsoft/git
derrickstolee 9272521
update-microsoft-git: Windows implementation
derrickstolee 1f4fc34
.github: update PULL_REQUEST_TEMPLATE.md
derrickstolee e827bc4
git_config_set_multivar_in_file_gently(): add a lock timeout
dscho 5bebc82
update-microsoft-git: use brew on macOS
derrickstolee 74ddf0b
Adjust README.md for microsoft/git
bd144f8
scalar: set the config write-lock timeout to 150ms
dscho b8035a1
scalar: add docs from microsoft/scalar
derrickstolee 92bdcec
Merge branch 'scalar-gentler-config-locking'
dscho 324afd0
Merge branch 'scalar-extra-docs'
dscho 59f4b95
scalar (Windows): use forward slashes as directory separators
dscho e04c82b
scalar: add retry logic to run_git()
derrickstolee 916c432
scalar: support the `config` command for backwards compatibility
dscho b049a2a
Merge branch 'microsoft/vfs-2.35.0'
dscho a1a8744
scalar: implement a minimal JSON parser
dscho 5cf2815
Merge branch 'scalar'
dscho 96ac103
scalar clone: support GVFS-enabled remote repositories
dscho 2559da3
test-gvfs-protocol: also serve smart protocol
dscho e8e4251
gvfs-helper: add the `endpoint` command
dscho 007c22d
dir_inside_of(): handle directory separators correctly
dscho d26e243
scalar: disable authentication in unattended mode
dscho 6bae332
scalar: do initialize `gvfs.sharedCache`
dscho b3c317e
scalar diagnose: include shared cache info
dscho 0b806b5
scalar: only try GVFS protocol on https:// URLs
dscho 8f62ab7
scalar: verify that we can use a GVFS-enabled repository
dscho 9d5cd82
scalar: add the `cache-server` command
dscho 217fdab
scalar: add a test toggle to skip accessing the vsts/info endpoint
dscho 1437866
scalar: adjust documentation to the microsoft/git fork
dscho eacd5a0
scalar: enable untracked cache unconditionally
derrickstolee a3af3c2
scalar: parse `clone --no-fetch-commits-and-trees` for backwards comp…
dscho 2d923b0
scalar: make GVFS Protocol a forced choice
derrickstolee 1b9c41a
scalar diagnose: accommodate Scalar's Functional Tests
dscho 1f77217
abspath: make strip_last_path_component() global
derrickstolee 1880963
scalar: work around GVFS Protocol HTTP/2 failures
Copilot 07af3a3
ci: run Scalar's Functional Tests
dscho a689d52
scalar: upgrade to newest FSMonitor config setting
vdye b029a04
scalar: .scalarCache should live above enlistment
derrickstolee 4050f15
Merge branch 'scalar-with-gvfs'
dscho 86d2aa0
Merge branch 'run-scalar-functional-tests'
dscho 32639c7
Merge branch 'scalar-reconfigure'
dscho e3dce1d
add/rm: allow adding sparse entries when virtual
derrickstolee 8907404
Merge pull request #536: Allow --no-src during clones and git worktre…
dscho f40961e
sparse-checkout: add config to disable deleting dirs
derrickstolee 6d8eba0
diff: ignore sparse paths in diffstat
derrickstolee 84679f2
Merge pull request #392: add: allow adding sparse entries when virtual
derrickstolee 725c9e2
repo-settings: enable sparse index by default
derrickstolee 89c64e3
Merge pull request #410: Sparse Index: latest integrations
derrickstolee 0dc5abd
diff(sparse-index): verify with partially-sparse
ldennington c9e1b30
Merge pull request #414: Make sparse index the default
derrickstolee 58b2522
stash: expand testing for `git stash -u`
vdye a670d49
Merge pull request #419 from ldennington/sparse-index-diff
ldennington 5d6f2f6
sequencer: avoid progress when stderr is redirected
derrickstolee 68345e6
Merge pull request #430 from vdye/sparse-index/clean
vdye 43a798c
Merge pull request #432: sequencer: avoid progress when stderr is red…
derrickstolee 40a9a47
sparse: add vfs-specific precautions
derrickstolee ef9e9e7
reset: fix mixed reset when using virtual filesystem
6a8860d
Merge pull request #494: reset: fix mixed reset when using virtual fi…
derrickstolee 3b868b8
Merge core VFS features
dscho 38e190a
Merge advanced VFS-specific features
dscho 9902ceb
Merge virtualfilesystem hook
dscho b428276
Merge updates to serialized status
dscho ca20ad2
Merge trace2 experimental regions
jeffhostetler 659cd12
Merge first wave of gvfs-helper feature
jeffhostetler 6dc900a
Merge gvfs-helper prefetch feature
derrickstolee 59b8133
Harden gvfs-helper to validate the packfiles in a multipart prefetch …
jeffhostetler 0f05b5b
gvfs-helper: add gvfs.fallback and unit tests (#665)
dscho cccffdd
Merge pull request #301: Update 'git maintenance' to match upstream
derrickstolee f7de76d
Merge pull request #315: unpack-trees:virtualfilesystem: Improve effi…
derrickstolee 9cd3d55
Merge branch 'add-workflows'
derrickstolee f45f221
Merge branch 'adjust-g4w-workflows'
dscho 9c35894
Merge pull request #399 from vdye/feature/build-installers
vdye 630b847
Merge pull request #472 from vdye/ms/macos-build-options
vdye 6e28cd8
Merge pull request #329: Add `git update-microsoft-git`
derrickstolee c9a56ed
Merge pull request #333: update microsoft/git README
derrickstolee 07ed7bf
Merge pull request #371 from dscho/run-scalar-functional-tests-and-fi…
dscho eb92d8b
sparse-index: add ensure_full_index_with_reason()
derrickstolee 312cee3
treewide: add reasons for expanding index
derrickstolee 2ed5e99
treewide: custom reasons for expanding index
derrickstolee e816d9e
sparse-index: add macro for unaudited expansions
derrickstolee b3c4b3a
Docs: update sparse index plan with logging
derrickstolee 86ee1d2
sparse-index: log failure to clear skip-worktree
derrickstolee 1c539fe
Merge branch 'sparse-index-stuff'
dscho eabc8df
sparse-checkout: remove use of the_repository
derrickstolee 10f201b
stash: use -f in checkout-index child process
derrickstolee 08cbe49
sparse-checkout: add basics of 'clean' command
derrickstolee 636faf3
sparse-index: do not copy hashtables during expansion
derrickstolee f71f513
Sparse Index: log why the index is being expanded (#691)
dscho b40b74f
sparse-checkout: match some 'clean' behavior
derrickstolee 1188812
Fix rare segfault in sparse-index (#690)
dscho 1c55ee3
dir: add generic "walk all files" helper
derrickstolee e1aba5d
sparse-checkout: add --verbose option to 'clean'
derrickstolee c0035c9
sparse-index: point users to new 'clean' action
derrickstolee 4bf26c6
t: expand tests around sparse merges and clean
derrickstolee 0503b78
sparse-checkout: make 'clean' clear more files
derrickstolee 43c3da3
sparse-checkout: mark 'clean' as experimental
derrickstolee d19af00
sub-process: avoid leaking `cmd`
dscho 58ff48a
remote-curl: release filter options before re-setting them
dscho e5bf48f
transport: release object filter options
dscho 464562c
Add 'git sparse-checkout clean' (#779)
dscho b53e5c2
push: don't reuse deltas with path walk
derrickstolee 51901a8
Merge branch 'leak-fixes'
dscho 99f167c
t7900-maintenance.sh: reset config between tests
mjcheetham 7f890e6
maintenance: add cache-local-objects maintenance task
mjcheetham 107be90
scalar.c: add cache-local-objects task
mjcheetham 39b61e5
pack-objects: don't reuse deltas with path walk (#707)
dscho f148e94
git.c: add VFS enabled cmd blocking
mjcheetham 8d18b51
git.c: permit repack cmd in Scalar repos
mjcheetham 514cbe6
git.c: permit fsck cmd in Scalar repos
mjcheetham 24b1abe
git.c: permit prune cmd in Scalar repos
mjcheetham f61256c
maintenance: add new `cache-local-objects` maintenance task (#720)
mjcheetham 2b83a1d
hooks: add custom post-command hook config
derrickstolee b8cd956
worktree: remove special case GVFS cmd blocking
mjcheetham f7a55e9
Docs: fix asciidoc failures from short delimiters
derrickstolee d5cd206
builtin/repack.c: emit warning when shared cache is present
mjcheetham e42a475
hooks: make hook logic memory-leak free
derrickstolee 105f49c
Permit `repack` command in Scalar clones (#732)
mjcheetham 7942a1e
hooks: add custom post-command hook config (#736)
dscho 3f8ca8d
t5309: create failing test for 'git index-pack'
derrickstolee c1a3bc7
gvfs-helper: pass `long` values where expected
dscho edafff0
Fix REF_DELTA chain bug in 'git index-pack' (#745)
dscho 0dea22e
gvfs-helper-client: clean up server process(es)
derrickstolee ae8b6d3
Merge branch 'curl-options-want-long-instead-of-int-msft-git'
dscho 66f6357
clar: pass a string for a `%s` format placeholder
dscho 2795fa7
clar(clar__assert_equal): do in-bounds check before accessing element
dscho fdd8377
clar(clar_summary_testsuite): avoid thread-unsafe `localtime()`
dscho 559396e
cat_one_file(): make it easy to see that the `size` variable is initi…
dscho 13a1ed0
fsck: avoid using an uninitialized variable
dscho ae4a90a
load_revindex_from_disk(): avoid accessing uninitialized data
dscho 877e3a3
revision: defensive programming
dscho 8046321
load_pack_mtimes_file(): avoid accessing uninitialized data
dscho 07ea788
get_parent(): defensive programming
dscho 5694bb5
fetch-pack: defensive programming
dscho 7120035
unparse_commit(): defensive programming
dscho a8f231c
verify_commit_graph(): defensive programming
dscho f561dfc
stash: defensive programming
dscho 00e3d8d
stash: defensive programming
dscho 0448b70
push: defensive programming
dscho 7b22fca
fetch: defensive programming
dscho c9e5c48
fetch: silence a CodeQL alert about a local variable's address' use a…
dscho 23009bf
describe: defensive programming
dscho c3fb973
submodule: check return value of `submodule_from_path()`
dscho 7d161d3
inherit_tracking(): defensive programming
dscho 4b1d576
codeql: run static analysis as part of CI builds
dscho 0a1a0cf
test-tool repository: check return value of `lookup_commit()`
dscho 137c9ca
codeql: publish the sarif file as build artifact
dscho afefd5a
shallow: handle missing shallow commits gracefully
dscho d2daf2d
codeql: disable a couple of non-critical queries for now
dscho c01e438
commit-graph: suppress warning about using a stale stack addresses
dscho 3c93a94
date: help CodeQL understand that there are no leap-year issues here
dscho 800fb94
help: help CodeQL understand that consuming envvars is okay here
dscho 1fe452c
ctype: help CodeQL understand that `sane_istest()` does not access ar…
dscho ecbecc9
ctype: accommodate for CodeQL misinterpreting the `z` in `mallocz()`
dscho 69e0125
strbuf_read: help with CodeQL misunderstanding that `strbuf_read()` d…
dscho 4fa44ec
codeql: also check JavaScript code
dscho a3c6542
Merge branch 'clar'
dscho 84f8a78
Merge branch 'uninitialized-variables'
dscho c12f52f
Merge branch 'defensive-programming'
dscho 41df2a1
Merge branch 'codeql-fixes'
dscho f2737e5
Merge branch 'codeql'
dscho a802cad
gvfs-helper-client: clean up server process (#756)
dscho 13ccaa1
Merge branch 'codeql'
dscho 248367f
Merge branch 'codeql'
dscho fe36b13
fixup! codeql: run static analysis as part of CI builds
mjcheetham a042926
fixup! maintenance: care about gvfs.sharedCache config
dscho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.