[DO NOT MERGE] Rebase to v2.21.0#122

Closed

dscho wants to merge 151 commits intogfw/2.21.0from

tentative/vfs-2.21.0

Commits on Feb 27, 2019

reset --stdin: trim carriage return from the paths

Kevin Willford
authored and
dscho
committed
Merge 'gvfs-preamble' into HEAD
dscho
committed
gvfs: start by adding the -gvfs suffix to the version

sanoursa
authored and
dscho
committed
gvfs: ensure that the version is based on a GVFS tag
dscho
committed
gvfs: add a GVFS-specific header file

Kevin Willford
authored and
dscho
committed
gvfs: add the core.gvfs config setting

Kevin Willford
authored and
dscho
committed
gvfs: add the feature to skip writing the index' SHA-1

Kevin Willford
authored and
dscho
committed
gvfs: add the feature that blobs may be missing

Kevin Willford
authored and
dscho
committed
gvfs: prevent files to be deleted outside the sparse checkout

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

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

Kevin Willford
authored and
dscho
committed
fsck: use ERROR_MULTI_PACK_INDEX

derrickstolee
authored and
dscho
committed
repack: refactor pack deletion for future use

derrickstolee
authored and
dscho
committed
Docs: rearrange subcommands for multi-pack-index

derrickstolee
authored and
dscho
committed
multi-pack-index: prepare for 'expire' subcommand

derrickstolee
authored and
dscho
committed
midx: refactor permutation logic

derrickstolee
authored and
dscho
committed
multi-pack-index: implement 'expire' verb

derrickstolee
authored and
dscho
committed
multi-pack-index: prepare 'repack' subcommand

derrickstolee
authored and
dscho
committed
midx: implement midx_repack()

derrickstolee
authored and
dscho
committed
midx: use more structured data for expire

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

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

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

Kevin Willford
authored and
dscho
committed

Commits on Mar 29, 2019

gvfs: ensure all filters and EOL conversions are blocked

Ben Peart
authored and
dscho
committed
Add a new run_hook_argv() function
dscho
committed
gvfs: allow "virtualizing" objects

Ben Peart
authored and
dscho
committed
gvfs: add global command pre and post hook procs

Ben Peart
authored and
dscho
committed
Hydrate missing loose objects in check_and_freshen()

Ben Peart
authored and
dscho
committed
Allow hooks to be run before setup_git_directory()
dscho
committed
Add support for read-object as a background process to retrieve missing objects

Ben Peart
authored and
dscho
committed
gvfs: introduce pre/post command hooks

Ben Peart
authored and
dscho
committed
sha1_file: when writing objects, skip the read_object_hook
dscho
committed
t0400: verify that the hook is called correctly from a subdirectory
dscho
committed
Merge 'read-object-hook' into HEAD
dscho
committed
Pass PID of git process to hooks.

alepauly
authored and
dscho
committed
pre-command: always respect core.hooksPath
dscho
committed
Merge 'pre-post-command-hooks' into HEAD
dscho
committed
Merge 'sparse-checkout-fixes' into HEAD
dscho
committed
status: add status.aheadbehind setting

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

jamill
authored and
dscho
committed
gvfs: refactor loading the core.gvfs config value

Kevin Willford
authored and
dscho
committed
status: add warning when a/b calculation takes too long for long/normal format

jeffhostetler
authored and
dscho
committed
status: add status serialization mechanism

jeffhostetler
authored and
dscho
committed
cache-tree: remove use of strbuf_addf in update_one

Kevin Willford
authored and
dscho
committed
status: ignore status.aheadbehind in porcelain formats

jeffhostetler
authored and
dscho
committed
Merge branch 'serialize_status_gvfs'
dscho
committed
status: serialize to path

jeffhostetler
authored and
dscho
committed
fetch: Warn about forced updates after branch list

derrickstolee
authored and
dscho
committed
status: reject deserialize in V2 and conflicts

jeffhostetler
authored and
dscho
committed
push: add --[no-]show-forced-updates passthrough to fetch

derrickstolee
authored and
dscho
committed
fetch: Add --[no-]show-forced-updates argument

derrickstolee
authored and
dscho
committed
Merge branch 'ahead-behind-and-serialized-status'
dscho
committed
fetch: add documentation for --[no-]show-forced-updates

derrickstolee
authored and
dscho
committed
Add virtual file system settings and hook proc

benpeart
authored and
dscho
committed
Update the virtualfilesystem support

benpeart
authored and
dscho
committed
virtualfilesystem: don't run the virtual file system hook if the index has been redirected

benpeart
authored and
dscho
committed
virtualfilesystem: fix bug with symlinks being ignored

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

Kevin Willford
authored and
dscho
committed
Merge branch 'show-forced-updates'
dscho
committed
vfs: fix case where directories not handled correctly

jamill
authored and
dscho
committed
Merge 'forced-updates-after-branch-list'
dscho
committed
status: fix rename reporting when using serialization cache

jeffhostetler
authored and
dscho
committed
commit: add generation to pop_most_recent_commit()

derrickstolee
authored and
dscho
committed
Merge 'virtual-file-system-support'
dscho
committed
status: add comments for ahead_behind_flags in serialization

jeffhostetler
authored and
dscho
committed
Merge 'gvfs/ds/generation-numbers-update'
dscho
committed
Merge pull request #6 from jeffhostetler/gvfs-serialize-status-rename

jeffhostetler
authored and
dscho
committed
serialize-status: serialize global and repo-local exclude file metadata

jeffhostetler
authored and
dscho
committed
status: deserialization wait

jeffhostetler
authored and
dscho
committed
Merge pull request #1 from jeffhostetler/gvfs-serialize-exclude

jeffhostetler
authored and
dscho
committed
rebase/stash: make post-command hook work again
dscho
committed
Merge pull request #7 from jeffhostetler/gvfs-status-serialize-wait

jeffhostetler
authored and
dscho
committed
read-cache: add post-indexchanged hook

benpeart
authored and
dscho
committed
Merge pull request #36 Avoid `sane_execvp` in `git rebase` and `git stash`

derrickstolee
authored and
dscho
committed
read-cache: post-indexchanged hook add skip-worktree bit changing support

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

Kevin Willford
authored and
dscho
committed
Merge pull request #24 Match multi-pack-index feature from upstream
dscho
committed
read-cache: add test for post-indexchanged hook

benpeart
authored and
dscho
committed
Add documentation for the post-indexchanged hook

Kevin Willford
authored and
dscho
committed
Merge pull request #68 send-pack do not check for sha1 file when GVFS_MISSING_OK set

Kevin Willford
authored and
dscho
committed
update the reset --quiet path codepath to pass the correct flags to the post-indexchanged hook

benpeart
authored and
dscho
committed
Merge pull request #64 Index changed hook

Kevin Willford
authored and
dscho
committed
gvfs: block unsupported commands when running in a GVFS repo

benpeart
authored and
dscho
committed
Merge pull request #93 from benpeart/reset-quiet-post-indexchanged

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

Kevin Willford
authored and
dscho
committed
Merge pull request #91 from benpeart/block-commands

benpeart
authored and
dscho
committed
Merge pull request #98 Add explanation of branches and using forks

Kevin Willford
authored and
dscho
committed
Merge pull request #84 Create 'expire' and 'repack' subcommands for multi-pack-index

derrickstolee
authored and
dscho
committed
Merge pull request #107 use more structured data for midx expire

derrickstolee
authored and
dscho
committed

Commits on Apr 9, 2019

MSVC: include compat/win32/path-utils.h for MSVC, too, for real_path()

csware
authored and
gitster
committed

Commits on Apr 23, 2019

Commits on Apr 24, 2019

Commits on Apr 26, 2019

Merge branch 'ss/msvc-path-utils-fix'
dscho
committed

Commits on May 13, 2019