A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Jeff Hostetler 322ea4d105
Harden gvfs-helper to validate the packfiles in a multipart prefetch response (#571)
Teach `gvfs-helper` to ignore the optional `.idx` files that may be
included in a `prefetch` response and always use `git index-pack` to
create them from the `.pack` files received in the data stream.

This is a little wasteful in terms of client-side compute and of the
network bandwidth, but allows us to use the full packfile verification
code contained within `git index-pack` to ensure that the received
packfiles are valid.
2023-04-17 11:58:10 -04:00
.github fixup! release: create draft GitHub release with packages & installers 2023-03-17 13:26:28 +01:00
Documentation Merge branch 'sparse-index-stuff' 2023-03-14 11:11:10 +01:00
block-sha1
builtin reset: fix mixed reset when using virtual filesystem 2023-03-14 11:09:47 +01:00
ci
compat trace2: refactor setting process starting time 2023-03-14 11:09:31 +01:00
contrib scalar: adjust documentation to the microsoft/git fork 2023-03-14 11:09:40 +01:00
ewah
git-gui Merge branch 'git-gui-askyesno' 2023-03-13 18:23:41 +01:00
gitk-git gitk: make the "list references" default window width wider 2023-03-13 18:23:41 +01:00
gitweb Merge branch 'jr/gitweb-title-shortening' 2022-08-05 15:52:14 -07:00
mergetools
negotiator
oss-fuzz Merge branch 'ac/fuzzers' 2022-10-07 17:19:59 -07:00
perl
po
refs
reftable
sha1collisiondetection@855827c583
sha1dc Merge branch 'jk/lore-is-the-archive' 2019-12-06 15:09:23 -08:00
sha256 sha256: add support for Nettle 2022-07-10 14:43:34 -07:00
t gvfs-helper: ignore .idx files in prefetch multi-part responses 2023-04-17 11:30:24 -04:00
templates
trace2 trace2:gvfs:experiment: increase default event depth for unpack-tree data 2023-03-14 11:09:32 +01:00
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore Merge pull request #329: Add `git update-microsoft-git` 2023-03-14 11:11:09 +01:00
.gitmodules
.mailmap
.tsan-suppressions
ARCHITECTURE.md
BRANCHES.md BRANCHES.md: Add explanation of branches and using forks 2023-03-14 11:09:29 +01:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md
COPYING
GIT-VERSION-GEN gvfs: ensure that the version is based on a GVFS tag 2023-03-14 10:31:23 +01:00
INSTALL
LGPL-2.1
Makefile Merge pull request #371 from dscho/run-scalar-functional-tests-and-fix-built-in-fsmonitor 2023-03-14 11:11:10 +01:00
README.md Adjust README.md for microsoft/git 2023-03-14 11:09:38 +01:00
RelNotes
SECURITY.md
abspath.c abspath: make strip_last_path_component() global 2023-03-14 11:09:41 +01:00
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c sparse-checkout: avoid writing entries with the skip-worktree bit 2023-03-14 11:09:28 +01:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
azure-pipelines.yml
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c
branch.h
builtin.h update-microsoft-git: create barebones builtin 2023-03-14 11:09:37 +01:00
bulk-checkin.c
bulk-checkin.h
bundle-uri.c Merge branch 'ds/bundle-uri-5' 2023-02-15 17:11:52 -08:00
bundle-uri.h
bundle.c
bundle.h
cache-tree.c trace2:gvfs:experiment: add region to cache_tree_fully_valid() 2023-03-14 11:09:32 +01:00
cache-tree.h
cache.h setup: add discover_git_directory_reason() 2023-03-14 11:09:41 +01:00
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c gvfs: add the feature that blobs may be missing 2023-03-14 11:09:27 +01:00
commit.h
common-main.c grep: fix multibyte regex handling under macOS 2022-08-26 11:45:52 -07:00
config.c Merge branch 'scalar' 2023-03-14 11:09:39 +01:00
config.h Add virtual file system settings and hook proc 2023-03-14 11:09:29 +01:00
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
connected.c gvfs: allow "virtualizing" objects 2023-03-14 11:09:27 +01:00
connected.h
convert.c gvfs: ensure all filters and EOL conversions are blocked 2023-03-14 11:09:27 +01:00
convert.h
copy.c copy.c: use error_errno() 2016-05-09 12:29:08 -07:00
credential.c credential: set trace2_child_class for credential manager children 2023-03-14 11:09:32 +01:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diagnose.c scalar diagnose: accommodate Scalar's Functional Tests 2023-03-14 11:09:41 +01:00
diagnose.h builtin/diagnose.c: add '--mode' option 2022-08-12 13:20:02 -07:00
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c diff: ignore sparse paths in diffstat 2023-03-14 10:33:05 +01:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS` 2023-02-16 16:21:56 -08:00
dir-iterator.h
dir.c Merge branch 'sparse-index-stuff' 2023-03-14 11:11:10 +01:00
dir.h
editor.c
entry.c
entry.h
environment.c sha1-file: create shared-cache directory if it doesn't exist 2023-03-14 11:09:33 +01:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-path-utils.h fsmonitor: deal with synthetic firmlinks on macOS 2022-10-05 11:05:23 -07:00
fsmonitor-settings.c
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h gettext: remove optional non-standard parens in N_() definition 2021-09-03 11:40:30 -07:00
git-archimport.perl
git-compat-util.h
git-curl-compat.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c update-microsoft-git: create barebones builtin 2023-03-14 11:09:37 +01:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
gvfs-helper-client.c gvfs-helper: add prefetch support 2023-03-14 11:09:34 +01:00
gvfs-helper-client.h gvfs-helper: add prefetch support 2023-03-14 11:09:34 +01:00
gvfs-helper.c gvfs-helper: ignore .idx files in prefetch multi-part responses 2023-04-17 11:30:24 -04:00
gvfs.c gvfs: allow overriding core.gvfs 2023-03-14 11:09:29 +01:00
gvfs.h fetch: use gvfs-helper prefetch under config 2023-03-14 11:09:35 +01:00
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
hook.c backwards-compatibility: support the post-indexchanged hook 2023-03-14 11:09:29 +01:00
hook.h
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
iterator.h
json-parser.c scalar: implement a minimal JSON parser 2023-03-14 11:09:40 +01:00
json-parser.h scalar: implement a minimal JSON parser 2023-03-14 11:09:40 +01:00
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h linear-assignment: a function to solve least-cost assignment problems 2018-08-13 10:44:50 -07:00
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c lockfile.c: use is_dir_sep() instead of hardcoded '/' checks 2023-03-13 18:23:44 +01:00
lockfile.h
log-tree.c
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c
merge-ort.h
merge-recursive.c merge-recursive: teach was_dirty() about the virtualfilesystem 2023-03-14 11:09:30 +01:00
merge-recursive.h
merge.c
mergesort.h
midx.c
midx.h
name-hash.c unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2023-03-14 11:09:35 +01:00
notes-cache.c
notes-cache.h notes-cache.c: remove the_repository references 2018-11-12 14:50:06 +09:00
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file.c sha1-file: create shared-cache directory if it doesn't exist 2023-03-14 11:09:33 +01:00
object-name.c
object-store.h sha1-file: add function to update existing loose object cache 2023-03-14 11:09:33 +01:00
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-mtimes.c pack-mtimes: avoid closing a bogus file descriptor 2022-06-16 13:22:03 -07:00
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c packfile: add install_packed_git_and_mru() 2023-03-14 11:09:33 +01:00
packfile.h packfile: add install_packed_git_and_mru() 2023-03-14 11:09:33 +01:00
pager.c
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h abspath: make strip_last_path_component() global 2023-03-14 11:09:41 +01:00
pathspec.c
pathspec.h
pkt-line.c status: add status serialization mechanism 2023-03-14 11:09:30 +01:00
pkt-line.h status: add status serialization mechanism 2023-03-14 11:09:30 +01:00
preload-index.c
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c gvfs-helper: create tool to fetch objects using the GVFS Protocol 2023-03-14 11:09:33 +01:00
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c ref-filter: --format=%(raw) support --perl 2021-07-26 12:01:25 -07:00
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache.c trace2:gvfs:experiment: read-cache: time read/write of cache-tree extension 2023-03-14 11:09:32 +01:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c
refs.h
refspec.c
refspec.h
remote-curl.c remote-curl: do not call fetch-pack when using gvfs-helper 2023-03-14 11:09:35 +01:00
remote.c Trace2:gvfs:experiment: capture more 'tracking' details 2023-03-14 11:09:32 +01:00
remote.h
replace-object.c
replace-object.h replace-object: make replace operations thread-safe 2020-01-17 13:52:14 -08:00
repo-settings.c repo-settings: enable sparse index by default 2023-03-14 11:09:44 +01:00
repository.c
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c
run-command.h
scalar.c scalar: add --no-src option 2023-03-14 11:09:41 +01:00
send-pack.c send-pack: do not check for sha1 file when GVFS_MISSING_OK set 2023-03-14 11:09:28 +01:00
send-pack.h
sequencer.c sequencer: avoid progress when stderr is redirected 2023-03-14 10:33:07 +01:00
sequencer.h
serve.c
serve.h
server-info.c
setup.c setup: add discover_git_directory_reason() 2023-03-14 11:09:41 +01:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Add virtual file system settings and hook proc 2023-03-14 11:09:29 +01:00
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c sub-process: add subprocess_start_argv() 2023-03-14 11:09:33 +01:00
sub-process.h sub-process: add subprocess_start_argv() 2023-03-14 11:09:33 +01:00
submodule-config.c
submodule-config.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trace2.c
trace2.h
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2023-03-14 11:09:35 +01:00
unpack-trees.h
upload-pack.c upload-pack: fix race condition in error messages 2023-03-14 11:09:35 +01:00
upload-pack.h
url.c Fix spelling errors in code comments 2019-11-10 16:00:54 +09:00
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
versioncmp.c
virtualfilesystem.c unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2023-03-14 11:09:35 +01:00
virtualfilesystem.h unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2023-03-14 11:09:35 +01:00
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c Merge branch 'jk/pipe-command-nonblock' 2022-08-25 14:42:32 -07:00
write-or-die.c
ws.c
wt-status-deserialize.c gvfs:trace2:data: status deserialization information 2023-03-14 11:09:31 +01:00
wt-status-serialize.c gvfs:trace2:data: status serialization 2023-03-14 11:09:31 +01:00
wt-status.c status: serialize to path 2023-03-14 11:09:30 +01:00
wt-status.h gvfs:trace2:data: status deserialization information 2023-03-14 11:09:31 +01:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

microsoft/git and the Scalar CLI

Open in Visual Studio Code Build status

This is microsoft/git, a special Git distribution to support monorepo scenarios. If you are not working in a monorepo, you are likely searching for Git for Windows instead of this codebase.

In addition to the Git command-line interface (CLI), microsoft/git includes the Scalar CLI to further enable working with extremely large repositories. Scalar is a tool to apply the latest recommendations and use the most advanced Git features. You can read the Scalar CLI documentation or read our Scalar user guide including the philosophy of Scalar.

If you encounter problems with microsoft/git, please report them as GitHub issues.

Why is this fork needed?

Git is awesome - it's a fast, scalable, distributed version control system with an unusually rich command set that provides both high-level operations and full access to internals. What more could you ask for?

Well, because Git is a distributed version control system, each Git repository has a copy of all files in the entire history. As large repositories, aka monorepos grow, Git can struggle to manage all that data. As Git commands like status and fetch get slower, developers stop waiting and start switching context. And context switches harm developer productivity.

microsoft/git is focused on addressing these performance woes and making the monorepo developer experience first-class. The Scalar CLI packages all of these recommendations into a simple set of commands.

One major feature that Scalar recommends is partial clone, which reduces the amount of data transferred in order to work with a Git repository. While several services such as GitHub support partial clone, Azure Repos instead has an older version of this functionality called the GVFS protocol. The integration with the GVFS protocol present in microsoft/git is not appropriate to include in the core Git client because partial clone is the official version of that functionality.

Downloading and Installing

If you're working in a monorepo and want to take advantage of the performance boosts in microsoft/git, then you can download the latest version installer for your OS from the Releases page. Alternatively, you can opt to install via the command line, using the below instructions for supported OSes:

Windows

Note: Winget is still in public preview, meaning you currently need to take special installation steps: Either manually install the .appxbundle available at the preview version of App Installer, or participate in the Windows Insider flight ring since winget is available by default on preview versions of Windows.

To install with Winget, run

winget install --id microsoft.git

Double-check that you have the right version by running these commands, which should have the same output:

git version
scalar version

To upgrade microsoft/git, use the following Git command, which will download and install the latest release.

git update-microsoft-git

You may also be alerted with a notification to upgrade, which presents a single-click process for running git update-microsoft-git.

macOS

To install microsoft/git on macOS, first be sure that Homebrew is installed then install the microsoft-git cask with these steps:

brew tap microsoft/git
brew install --cask microsoft-git

Double-check that you have the right version by running these commands, which should have the same output:

git version
scalar version

To upgrade microsoft/git, you can run the necessary brew commands:

brew update
brew upgrade --cask microsoft-git

Or you can run the git update-microsoft-git command, which will run those brew commands for you.

Linux

Ubuntu/Debian distributions

On newer distributions*, you can download the most recent Debian package from the releases page (or using a tool such as wget) then run:

sudo dpkg -i <path to package>

Double-check that you have the right version by running these commands, which should have the same output:

git version
scalar version

To upgrade, you will need to repeat these steps to reinstall.

*Older distributions are missing some required dependencies. Even though the package may appear to install successfully, microsoft/ git will not function as expected. If you are running Ubuntu 18.04 or older, please follow the install from source instructions below instead of installing the debian package.

Other distributions

You will need to compile and install microsoft/git from source:

git clone https://github.com/microsoft/git microsoft-git
cd microsoft-git
make -j12 prefix=/usr/local
sudo make -j12 prefix=/usr/local install

For more assistance building Git from source, see the INSTALL file in the core Git project.

Contributing

This project welcomes contributions and suggestions. Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.

When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.

This project has adopted the Microsoft Open Source Code of Conduct. For more information see the Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments.