[DO NOT MERGE] Tentative vfs-2.33.0 branch#405

Merged

derrickstolee merged 234 commits intovfs-2.33.0from

tentative/vfs-2.33.0

Aug 17, 2021

Commits on Aug 17, 2021

reset --stdin: trim carriage return from the paths

Kevin Willford
authored and
derrickstolee
committed
gvfs: start by adding the -gvfs suffix to the version

sanoursa
authored and
derrickstolee
committed
status: add status serialization mechanism

jeffhostetler
authored and
derrickstolee
committed
Teach ahead-behind and serialized status to play nicely together

jamill
authored and
derrickstolee
committed
status: serialize to path

jeffhostetler
authored and
derrickstolee
committed
gvfs: add global command pre and post hook procs

Ben Peart
authored and
derrickstolee
committed
status: reject deserialize in V2 and conflicts

jeffhostetler
authored and
derrickstolee
committed
gvfs:trace2:data: add trace2 tracing around read_object_process

jeffhostetler
authored and
derrickstolee
committed
gvfs: ensure that the version is based on a GVFS tag

dscho
authored and
derrickstolee
committed
t0400: verify that the hook is called correctly from a subdirectory

dscho
authored and
derrickstolee
committed
status: fix rename reporting when using serialization cache

jeffhostetler
authored and
derrickstolee
committed
gvfs:trace2:data: status deserialization information

jeffhostetler
authored and
derrickstolee
committed
gvfs: add a GVFS-specific header file

Kevin Willford
authored and
derrickstolee
committed
Pass PID of git process to hooks.

alepauly
authored and
derrickstolee
committed
serialize-status: serialize global and repo-local exclude file metadata

jeffhostetler
authored and
derrickstolee
committed
gvfs:trace2:data: status serialization

jeffhostetler
authored and
derrickstolee
committed
gvfs: add the core.gvfs config setting

Kevin Willford
authored and
derrickstolee
committed
pre-command: always respect core.hooksPath

dscho
authored and
derrickstolee
committed
status: deserialization wait

jeffhostetler
authored and
derrickstolee
committed
gvfs:trace2:data: add vfs stats

jeffhostetler
authored and
derrickstolee
committed
gvfs: add the feature to skip writing the index' SHA-1

Kevin Willford
authored and
derrickstolee
committed
sparse-checkout: update files with a modify/delete conflict

Kevin Willford
authored and
derrickstolee
committed
merge-recursive: avoid confusing logic in was_dirty()

dscho
authored and
derrickstolee
committed
trace2: refactor setting process starting time

jeffhostetler
authored and
derrickstolee
committed
gvfs: add the feature that blobs may be missing

Kevin Willford
authored and
derrickstolee
committed
sparse-checkout: avoid writing entries with the skip-worktree bit

Kevin Willford
authored and
derrickstolee
committed
merge-recursive: add some defensive coding to was_dirty()

dscho
authored and
derrickstolee
committed
trace2:gvfs:experiment: clear_ce_flags_1

jeffhostetler
authored and
derrickstolee
committed
gvfs: prevent files to be deleted outside the sparse checkout

Kevin Willford
authored and
derrickstolee
committed
Fix reset when using the sparse-checkout feature.

Kevin Willford
authored and
derrickstolee
committed
merge-recursive: teach was_dirty() about the virtualfilesystem

dscho
authored and
derrickstolee
committed
trace2:gvfs:experiment: report_tracking

jeffhostetler
authored and
derrickstolee
committed
gvfs: optionally skip reachability checks/upload pack during fetch

Kevin Willford
authored and
derrickstolee
committed
Do not remove files outside the sparse-checkout

Kevin Willford
authored and
derrickstolee
committed
Add virtual file system settings and hook proc

benpeart
authored and
derrickstolee
committed
status: deserialize with -uno does not print correct hint

jeffhostetler
authored and
derrickstolee
committed
trace2:gvfs:experiment: read_cache: annotate thread usage in read-cache

jeffhostetler
authored and
derrickstolee
committed
gvfs: ensure all filters and EOL conversions are blocked

Ben Peart
authored and
derrickstolee
committed
gvfs: refactor loading the core.gvfs config value

Kevin Willford
authored and
derrickstolee
committed
Update the virtualfilesystem support

benpeart
authored and
derrickstolee
committed
wt-status-deserialize: fix crash when -v is used

jeffhostetler
authored and
derrickstolee
committed
trace2:gvfs:experiment: read-cache: time read/write of cache-tree extension

jeffhostetler
authored and
derrickstolee
committed
Add a new run_hook_strvec() function

dscho
authored and
derrickstolee
committed
send-pack: do not check for sha1 file when GVFS_MISSING_OK set

Kevin Willford
authored and
derrickstolee
committed
virtualfilesystem: don't run the virtual file system hook if the index has been redirected

benpeart
authored and
derrickstolee
committed
fsmonitor: check CE_FSMONITOR_VALID in ce_uptodate

kewillford
authored and
derrickstolee
committed
cache-tree: use `r` instead of `the_repository` in Trace2

jeffhostetler
authored and
derrickstolee
committed
gvfs: allow "virtualizing" objects

Ben Peart
authored and
derrickstolee
committed
cache-tree: remove use of strbuf_addf in update_one

Kevin Willford
authored and
derrickstolee
committed
virtualfilesystem: fix bug with symlinks being ignored

benpeart
authored and
derrickstolee
committed
fsmonitor: add script for debugging and update script for tests

kewillford
authored and
derrickstolee
committed
trace2:gvfs:experiment: add region to apply_virtualfilesystem()

jeffhostetler
authored and
derrickstolee
committed
Hydrate missing loose objects in check_and_freshen()

Ben Peart
authored and
derrickstolee
committed
gvfs: block unsupported commands when running in a GVFS repo

benpeart
authored and
derrickstolee
committed
virtualfilesystem: check if directory is included

Kevin Willford
authored and
derrickstolee
committed
status: disable deserialize when verbose output requested.

jeffhostetler
authored and
derrickstolee
committed
trace2:gvfs:experiment: add region around unpack_trees()

jeffhostetler
authored and
derrickstolee
committed
Add support for read-object as a background process to retrieve missing objects

Ben Peart
authored and
derrickstolee
committed
gvfs: allow overriding core.gvfs
derrickstolee
committed
vfs: fix case where directories not handled correctly

jamill
authored and
derrickstolee
committed
t7524: add test for verbose status deserialzation

jeffhostetler
authored and
derrickstolee
committed
trace2:gvfs:experiment: add region to cache_tree_fully_valid()

jeffhostetler
authored and
derrickstolee
committed
sha1_file: when writing objects, skip the read_object_hook

dscho
authored and
derrickstolee
committed
BRANCHES.md: Add explanation of branches and using forks

Kevin Willford
authored and
derrickstolee
committed
backwards-compatibility: support the post-indexchanged hook

dscho
authored and
derrickstolee
committed
deserialize-status: silently fallback if we cannot read cache file

jeffhostetler
authored and
derrickstolee
committed
credential: set trace2_child_class for credential manager children

jeffhostetler
authored and
derrickstolee
committed
sub-process: do not borrow cmd pointer from caller

jeffhostetler
authored and
derrickstolee
committed
sub-process: add subprocess_start_argv()

jeffhostetler
authored and
derrickstolee
committed
sha1-file: add function to update existing loose object cache

jeffhostetler
authored and
derrickstolee
committed
packfile: add install_packed_git_and_mru()

jeffhostetler
authored and
derrickstolee
committed
index-pack: avoid immediate object fetch while parsing packfile

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: create tool to fetch objects using the GVFS Protocol

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: fix race condition when creating loose object dirs
derrickstolee
committed
sha1-file: create shared-cache directory if it doesn't exist

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: better handling of network errors

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper-client: properly update loose cache with fetched OID

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: V2 robust retry and throttling

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: expose gvfs/objects GET and POST semantics

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: dramatically reduce progress noise
derrickstolee
committed
gvfs-helper: add prefetch support

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper-client.h: define struct object_id
derrickstolee
committed
gvfs-helper: add prefetch .keep file for last packfile

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: handle pack-file after single POST request
derrickstolee
committed
gvfs-helper: do one read in my_copy_fd_len_tail()
derrickstolee
committed
test-gvfs-prococol, t5799: tests for gvfs-helper

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: move content-type warning for prefetch packs
derrickstolee
committed
gvfs-helper: move result-list construction into install functions

jeffhostetler
authored and
derrickstolee
committed
trace2:gvfs:experiment: add unpack_entry() counter to unpack_trees() and report_tracking()

jeffhostetler
authored and
derrickstolee
committed
Merge core VFS features

dscho
authored and
derrickstolee
committed
fetch: use gvfs-helper prefetch under config
derrickstolee
committed
t5799: add support for POST to return either a loose object or packfile

jeffhostetler
authored and
derrickstolee
committed
trace2:gvfs:experiment: increase default event depth for unpack-tree data

jeffhostetler
authored and
derrickstolee
committed
Merge advanced VFS-specific features

dscho
authored and
derrickstolee
committed
gvfs-helper: better support for concurrent packfile fetches

jeffhostetler
authored and
derrickstolee
committed
t5799: cleanup wc-l and grep-c lines

jeffhostetler
authored and
derrickstolee
committed
trace2:gvfs:experiment: add data for check_updates() in unpack_trees()

jeffhostetler
authored and
derrickstolee
committed
Merge virtualfilesystem hook

dscho
authored and
derrickstolee
committed
remote-curl: do not call fetch-pack when using gvfs-helper
derrickstolee
committed
gvfs-helper: verify loose objects after write
derrickstolee
committed
Trace2:gvfs:experiment: capture more 'tracking' details

jeffhostetler
authored and
derrickstolee
committed
Merge updates to serialized status

dscho
authored and
derrickstolee
committed
fetch: reprepare packs before checking connectivity
derrickstolee
committed
t7599: create corrupt blob test

jeffhostetler
authored and
derrickstolee
committed
Merge trace2 experimental regions

jeffhostetler
authored and
derrickstolee
committed
gvfs-helper: retry when creating temp files
derrickstolee
committed
Merge first wave of gvfs-helper feature

jeffhostetler
authored and
derrickstolee
committed
update-microsoft-git: create barebones builtin
derrickstolee
committed
homebrew: add GitHub workflow to release Cask

mjcheetham
authored and
derrickstolee
committed
upload-pack: fix race condition in error messages
derrickstolee
committed
Merge gvfs-helper prefetch feature
derrickstolee
committed
update-microsoft-git: Windows implementation
derrickstolee
committed
maintenance: care about gvfs.sharedCache config
derrickstolee
committed
Merge upstreamable patches

dscho
authored and
derrickstolee
committed
unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags

neerajsi-msft2
authored and
derrickstolee
committed
Adding winget workflows

Lessley Dennington
authored and
derrickstolee
committed
update-microsoft-git: use brew on macOS
derrickstolee
committed
Adding readme for microsoft/git

Lessley Dennington
authored and
derrickstolee
committed
Merge pull request #301: Update 'git maintenance' to match upstream
derrickstolee
committed
Merge pull request #315: unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags
derrickstolee
committed
Implement `scalar diagnose`

dscho
authored and
derrickstolee
committed
Merge pull request #328: Adding winget workflow
derrickstolee
committed
scalar register: set recommended config settings

derrickstolee
and
vdye
committed
scalar: implement the `clone` subcommand

dscho
authored and
derrickstolee
committed
scalar diagnose: include disk space information

dscho
authored and
derrickstolee
committed
scalar: start documenting the command

dscho
authored and
derrickstolee
committed
Merge pull request #329: Add `git update-microsoft-git`
derrickstolee
committed
scalar register/unregister: start/stop maintenance on repository

derrickstolee
and
vdye
committed
scalar: test `scalar clone`

dscho
authored and
derrickstolee
committed
scalar: allow reconfiguring an existing enlistment

dscho
authored and
derrickstolee
committed
scalar: teach `diagnose` to gather packfile info

mjcheetham
authored and
derrickstolee
committed
scalar: document the `clone` subcommand

dscho
authored and
derrickstolee
committed
Merge pull request #333: update microsoft/git README
derrickstolee
committed
maintenance: create `launchctl` configuration using a lock file

dscho
authored and
derrickstolee
committed
Start porting `scalar.exe` to C

dscho
authored and
derrickstolee
committed
scalar: implement 'scalar list'
derrickstolee
committed
scalar clone: suppress warning about `init.defaultBranch`

dscho
authored and
derrickstolee
committed
scalar reconfigure: optionally handle all registered enlistments

dscho
authored and
derrickstolee
committed
scalar: teach `diagnose` to gather loose objs info

mjcheetham
authored and
derrickstolee
committed
scalar: enable built-in FSMonitor on `register`

mjcheetham
authored and
derrickstolee
committed
scalar: document `list`, `register` and `unregister`

dscho
authored and
derrickstolee
committed
git_config_set_multivar_in_file_gently(): add a lock timeout

dscho
authored and
derrickstolee
committed
ci: run Scalar's Functional Tests

dscho
authored and
derrickstolee
committed
t1092: mark passing test as success
derrickstolee
committed
maintenance: skip bootout/bootstrap when plist is registered
derrickstolee
committed
scalar: add a test script

dscho
authored and
derrickstolee
committed
scalar unregister: handle deleted enlistment directory gracefully

authored and
derrickstolee
committed
scalar clone: respect --single-branch

dscho
authored and
derrickstolee
committed
scalar: implement the `run` command
derrickstolee
committed
scalar: support the `config` command for backwards compatibility

dscho
authored and
derrickstolee
committed
scalar diagnose: show a spinner while staging content

dscho
authored and
derrickstolee
committed
scalar: implement the `delete` command

authored and
derrickstolee
committed
scalar: implement the `version` command

dscho
authored and
derrickstolee
committed
scalar: accept -C and -c options before the subcommand

dscho
authored and
derrickstolee
committed
scalar unregister: stop FSMonitor daemon

dscho
authored and
derrickstolee
committed
scalar: document the remaining subcommands

dscho
authored and
derrickstolee
committed
scalar: set the config write-lock timeout to 150ms

dscho
authored and
derrickstolee
committed
Merge pull request #371 from dscho/run-scalar-functional-tests-and-fix-built-in-fsmonitor

dscho
authored and
derrickstolee
committed
Merge pull request #358: maintenance: skip bootout/bootstrap when plist is registered
derrickstolee
committed
Merge branch 'barebones-scalar'

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-register-unregister-list'

dscho
authored and
derrickstolee
committed
scalar: implement a minimal JSON parser

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-clone'

dscho
authored and
derrickstolee
committed
scalar clone: support GVFS-enabled remote repositories

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-run'

dscho
authored and
derrickstolee
committed
test-gvfs-protocol: also serve smart protocol

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-reconfigure'

dscho
authored and
derrickstolee
committed
gvfs-helper: add the `endpoint` command

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-diagnose'

dscho
authored and
derrickstolee
committed
dir_inside_of(): handle directory separators correctly

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-delete'

dscho
authored and
derrickstolee
committed
scalar: disable authentication in unattended mode

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-version'

dscho
authored and
derrickstolee
committed
scalar: do initialize `gvfs.sharedCache`

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-c-and-C'

dscho
authored and
derrickstolee
committed
scalar diagnose: include shared cache info

dscho
authored and
derrickstolee
committed
git help: special-case `scalar`

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-and-builtin-fsmonitor'

dscho
authored and
derrickstolee
committed
scalar: only try GVFS protocol on https:// URLs

dscho
authored and
derrickstolee
committed
scalar: implement the `help` subcommand

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-docs'

dscho
authored and
derrickstolee
committed
scalar: verify that we can use a GVFS-enabled repository

dscho
authored and
derrickstolee
committed
NOT-TO-UPSTREAM: ci: build `scalar.exe`, too

dscho
authored and
derrickstolee
committed
Optionally include `scalar` when building/testing Git

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-gentler-config-locking'

dscho
authored and
derrickstolee
committed
scalar: add the `cache-server` command

dscho
authored and
derrickstolee
committed
ci(windows): also run `scalar` tests

dscho
authored and
derrickstolee
committed
Merge branch 'include-scalar-in-build'

dscho
authored and
derrickstolee
committed
scalar: add a test toggle to skip accessing the vsts/info endpoint

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-ci'

dscho
authored and
derrickstolee
committed
Merge branch 'scalar-with-gvfs'

dscho
authored and
derrickstolee
committed
ci: run Scalar functional tests for PRs against features/*
derrickstolee
committed
Merge pull request #366 from dscho/features/scalar-2.32.0

dscho
authored and
derrickstolee
committed
scalar: use microsoft/scalar:main for tests
derrickstolee
committed
Merge pull request #372: ci: run Scalar functional tests for PRs against features/*
derrickstolee
committed
scalar: add retry logic to run_git()
derrickstolee
committed
scalar: add docs from microsoft/scalar
derrickstolee
committed
Merge pull request #376: scalar: use microsoft/scalar:main for tests
derrickstolee
committed
scalar: only retry a full clone if not using GVFS protocol
derrickstolee
committed
Merge pull request #377: Update README to include Scalar CLI details
derrickstolee
committed
gvfs: disable the built-in FSMonitor

dscho
authored and
derrickstolee
committed
git-rebase.txt: correct antiquated claims about --rebase-merges

newren
authored and
derrickstolee
committed
directory-rename-detection.txt: small updates due to merge-ort optimizations

newren
authored and
derrickstolee
committed
Documentation: edit awkward references to `git merge-recursive`

newren
authored and
derrickstolee
committed
merge-strategies.txt: update wording for the resolve strategy

newren
authored and
derrickstolee
committed
merge-strategies.txt: do not imply using copy detection is desired

newren
authored and
derrickstolee
committed
Merge pull request #378: Scalar: Fix some flaky tests with retry logic and better GVFS Protocol awareness
derrickstolee
committed
merge-strategies.txt: avoid giving special preference to patience algorithm

newren
authored and
derrickstolee
committed
release: create initial Windows installer build workflow

vdye
authored and
derrickstolee
committed
Update winget manifest

Lessley Dennington
authored and
derrickstolee
committed
Merge pull request #379 from dscho/disable-fsmonitor-with-gvfs

dscho
authored and
derrickstolee
committed
merge-strategies.txt: fix simple capitalization error

newren
authored and
derrickstolee
committed
release: add Mac OSX installer build

vdye
authored and
derrickstolee
committed
Add workflow for apt-get release

dscho
authored and
derrickstolee
committed
Merge pull request #380 from ldennington/update-winget-manifest

Lessley Dennington
authored and
derrickstolee
committed
git-rebase.txt: correct out-of-date and misleading text about renames

newren
authored and
derrickstolee
committed
release: build unsigned Ubuntu .deb package

vdye
authored and
derrickstolee
committed
Add instructions for `apt-get` install to `README`

Lessley Dennington
authored and
derrickstolee
committed
add/rm: allow adding sparse entries when virtual
derrickstolee
committed
Merge pull request #386 from ldennington/add-release-apt-get-workflow

Lessley Dennington
authored and
derrickstolee
committed
merge-strategies.txt: add coverage of the `ort` merge strategy

newren
authored and
derrickstolee
committed
release: add signing step for .deb package

vdye
authored and
derrickstolee
committed
Clarify `workflow_dispatch` input description

ldennington
authored and
derrickstolee
committed
Merge pull request #392: add: allow adding sparse entries when virtual
derrickstolee
committed
Update error message and code comment

newren
authored and
derrickstolee
committed
release: create draft GitHub release with packages & installers

vdye
authored and
derrickstolee
committed
Merge pull request #393 from ldennington/update-linux

Lessley Dennington
authored and
derrickstolee
committed
Change default merge backend from recursive to ort

newren
authored and
derrickstolee
committed
Merge pull request #399 from vdye/feature/build-installers

vdye
authored and
derrickstolee
committed
Update docs for change of default merge backend

newren
authored and
derrickstolee
committed
Makefile: disable cURL warnings on gvfs-helper.c
derrickstolee
committed
Merge pull request #404: Make 'ort' the default merge strategy
derrickstolee
committed
sparse-index: fix crash in status

jeffhostetler
authored and
derrickstolee
committed
merge-ort: ignore skip-worktree bit with virtual filesystem
derrickstolee
committed

[DO NOT MERGE] Tentative vfs-2.33.0 branch#405derrickstolee merged 234 commits intovfs-2.33.0microsoft/git:vfs-2.33.0from tentative/vfs-2.33.0microsoft/git:tentative/vfs-2.33.0Copy head branch name to clipboard

Commits

Commits on Aug 17, 2021

[DO NOT MERGE] Tentative vfs-2.33.0 branch#405
derrickstolee merged 234 commits intovfs-2.33.0from
tentative/vfs-2.33.0