A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Derrick Stolee 6163052030
Merge pull request #495: Update README.md
2022-04-04 10:32:10 -04:00
.github .github: update PULL_REQUEST_TEMPLATE.md 2022-03-16 10:29:15 -04:00
Documentation checkout-index: add `--sparse` option 2022-02-01 16:47:02 +01:00
block-sha1
builtin reset: fix mixed reset when using virtual filesystem 2022-04-01 15:02:54 -04:00
ci ci(windows): also run `scalar` tests 2022-02-01 16:46:50 +01:00
compat trace2: refactor setting process starting time 2022-02-01 16:46:39 +01:00
contrib scalar: enable untracked cache unconditionally 2022-02-01 16:46:59 +01:00
ewah
git-gui Merge branch 'gitk-and-git-gui-patches' 2022-01-29 08:00:32 +01:00
gitk-git Merge branch 'gitk-and-git-gui-patches' 2022-01-29 08:00:32 +01:00
gitweb
mergetools
negotiator
perl
po
ppc
refs Introduce helper to create symlinks that knows about index_state 2022-01-29 08:00:27 +01:00
reftable
sha1collisiondetection@855827c583
sha1dc
sha256
t show: integrate with the sparse index 2022-02-01 16:47:08 +01:00
templates
trace2 trace2:gvfs:experiment: increase default event depth for unpack-tree data 2022-02-01 16:46:40 +01:00
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes gitattributes: mark .png files as binary 2022-01-29 08:00:27 +01:00
.gitignore Makefile: allow specifying GIT_BUILT_FROM_COMMIT 2022-02-01 16:47:08 +01:00
.gitmodules
.mailmap
.tsan-suppressions
BRANCHES.md BRANCHES.md: Add explanation of branches and using forks 2022-02-01 16:46:37 +01:00
CODE_OF_CONDUCT.md Modify the Code of Conduct for Git for Windows 2022-01-29 08:00:31 +01:00
CONTRIBUTING.md CONTRIBUTING.md: add guide for first-time contributors 2022-01-29 08:00:31 +01:00
COPYING
GIT-VERSION-GEN gvfs: ensure that the version is based on a GVFS tag 2022-02-01 16:46:35 +01:00
INSTALL
LGPL-2.1
Makefile dist: archive HEAD instead of HEAD^{tree} 2022-02-01 16:47:08 +01:00
README.md Update README.md 2022-04-04 07:27:05 -07:00
RelNotes Git 2.35.1 2022-01-28 16:48:42 -08:00
SECURITY.md SECURITY.md: document Git for Windows' policies 2022-01-29 08:00:31 +01:00
abspath.c strbuf_realpath(): use platform-dependent API if available 2022-01-29 07:59:54 +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 2022-02-01 16:46:36 +01:00
apply.h
archive-tar.c archive: avoid spawning `gzip` 2022-01-29 07:59:53 +01:00
archive-zip.c
archive.c
archive.h
attr.c
attr.h
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 2022-02-01 16:46:43 +01:00
bulk-checkin.c core.fsyncobjectfiles: batched disk flushes 2022-01-29 08:00:29 +01:00
bulk-checkin.h core.fsyncobjectfiles: batched disk flushes 2022-01-29 08:00:29 +01:00
bundle.c
bundle.h
cache-tree.c cache-tree: implement cache_tree_find_path() 2022-02-01 16:46:59 +01:00
cache-tree.h cache-tree: implement cache_tree_find_path() 2022-02-01 16:46:59 +01:00
cache.h sparse-index: introduce partially-sparse indexes 2022-02-01 16:46:59 +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
commit.h
common-main.c
config.c git_config_set_multivar_in_file_gently(): add a lock timeout 2022-02-01 16:46:49 +01:00
config.h Add virtual file system settings and hook proc 2022-02-01 16:46:37 +01:00
config.mak.dev
config.mak.in
config.mak.uname Merge pull request #3492 from dscho/ns/batched-fsync 2022-01-29 08:00:34 +01:00
configure.ac core.fsyncobjectfiles: batched disk flushes 2022-01-29 08:00:29 +01:00
connect.c
connect.h
connected.c gvfs: allow "virtualizing" objects 2022-02-01 16:46:36 +01:00
connected.h
convert.c gvfs: ensure all filters and EOL conversions are blocked 2022-02-01 16:46:35 +01:00
convert.h
copy.c
credential.c credential: set trace2_child_class for credential manager children 2022-02-01 16:46:40 +01:00
credential.h
csum-file.c gvfs: add the feature to skip writing the index' SHA-1 2022-02-01 16:46:35 +01:00
csum-file.h gvfs: add the feature to skip writing the index' SHA-1 2022-02-01 16:46:35 +01:00
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c diff: ignore sparse paths in diffstat 2022-02-01 16:46:57 +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.h
dir.c sparse-checkout: require starting '/' in cone mode patterns 2022-02-01 16:47:07 +01:00
dir.h dir: add path_matches_cone_mode_pattern_list() 2022-02-01 16:46:59 +01:00
editor.c Partially un-revert "editor: save and reset terminal after calling EDITOR" 2022-01-29 08:00:30 +01:00
entry.c Introduce helper to create symlinks that knows about index_state 2022-01-29 08:00:27 +01:00
entry.h
environment.c sha1-file: create shared-cache directory if it doesn't exist 2022-02-01 16:46:41 +01:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c fscache: fscache takes an initial size 2022-01-29 08:00:16 +01:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor--daemon.h fsmonitor--daemon: stub in health thread 2022-01-29 08:00:01 +01:00
fsmonitor-ipc.c fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-01-29 07:59:59 +01:00
fsmonitor-ipc.h fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-01-29 07:59:59 +01:00
fsmonitor-settings.c fsmonitor-settings: remote repos on MacOS are incompatible with FSMonitor 2022-01-29 08:00:01 +01:00
fsmonitor-settings.h fsmonitor-settings: remote repos on MacOS are incompatible with FSMonitor 2022-01-29 08:00:01 +01:00
fsmonitor.c fsmonitor: optimize processing of directory events 2022-01-29 08:00:02 +01:00
fsmonitor.h fsmonitor: config settings are repository-specific 2022-01-29 07:59:59 +01:00
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-add--interactive.perl Allow `add -p` and `add -i` with a large number of files 2022-01-29 07:59:55 +01:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge pull request #3492 from dscho/ns/batched-fsync 2022-01-29 08:00:34 +01:00
git-curl-compat.h http: optionally send SSL client certificate 2022-01-29 07:59:58 +01:00
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 mingw: only use Bash-ism `builtin pwd -W` when available 2022-01-29 08:00:27 +01:00
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c update-microsoft-git: create barebones builtin 2022-02-01 16:46:43 +01:00
git.rc
gpg-interface.c gpg-interface: trim CR from ssh-keygen -Y find-principals 2022-01-29 08:00:30 +01:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
gvfs-helper-client.c gvfs-helper: add prefetch support 2022-02-01 16:46:42 +01:00
gvfs-helper-client.h gvfs-helper: add prefetch support 2022-02-01 16:46:42 +01:00
gvfs-helper.c gvfs-helper: add the `endpoint` command 2022-02-01 16:46:50 +01:00
gvfs.c gvfs: allow overriding core.gvfs 2022-02-01 16:46:37 +01:00
gvfs.h fetch: use gvfs-helper prefetch under config 2022-02-01 16:46:42 +01:00
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c help: include fsmonitor--daemon feature flag in version info 2022-01-29 08:00:00 +01:00
help.h
hex.c
hook.c pre-command: always respect core.hooksPath 2022-02-01 16:46:36 +01:00
hook.h
http-backend.c mingw: ensure that core.longPaths is handled *always* 2022-01-29 08:00:25 +01:00
http-fetch.c
http-push.c
http-walker.c
http.c http: optionally send SSL client certificate 2022-01-29 07:59:58 +01:00
http.h
ident.c
imap-send.c
iterator.h
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
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 2022-01-29 08:00:25 +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: add GIT_TRACE_MEMPOOL support 2022-01-29 08:00:16 +01:00
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c merge-recursive: add merge function arg to `merge_recursive_generic` 2022-02-01 16:47:04 +01:00
merge-ort.h
merge-recursive.c merge-recursive: add merge function arg to `merge_recursive_generic` 2022-02-01 16:47:04 +01:00
merge-recursive.h merge-recursive: add merge function arg to `merge_recursive_generic` 2022-02-01 16:47:04 +01:00
merge.c
mergesort.c
mergesort.h
midx.c
midx.h
name-hash.c unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2022-02-01 16:46:42 +01:00
notes-cache.c
notes-cache.h
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 2022-02-01 16:46:41 +01:00
object-name.c
object-store.h sha1-file: add function to update existing loose object cache 2022-02-01 16:46:40 +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-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c trace2:gvfs:experiment: add unpack_entry() counter to unpack_trees() and report_tracking() 2022-02-01 16:46:40 +01:00
packfile.h trace2:gvfs:experiment: add unpack_entry() counter to unpack_trees() and report_tracking() 2022-02-01 16:46:40 +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 Merge branch 'deprecate-old-runtime-prefix-path-interpolation' 2022-01-29 08:00:36 +01:00
path.h
pathspec.c
pathspec.h
pkt-line.c status: add status serialization mechanism 2022-02-01 16:46:38 +01:00
pkt-line.h status: add status serialization mechanism 2022-02-01 16:46:38 +01:00
preload-index.c fscache: update fscache to be thread specific instead of global 2022-01-29 08:00:16 +01:00
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 2022-02-01 16:46:40 +01:00
promisor-remote.h
prompt.c git add -i: handle CR/LF line endings in the interactive input 2022-01-29 07:59:55 +01:00
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache.c sparse-index: fix index.sparse inline usage 2022-02-01 16:47:07 +01:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c mingw: ensure that core.longPaths is handled *always* 2022-01-29 08:00:25 +01:00
refs.h
refspec.c
refspec.h
remote-curl.c remote-curl: do not call fetch-pack when using gvfs-helper 2022-02-01 16:46:42 +01:00
remote.c Trace2:gvfs:experiment: capture more 'tracking' details 2022-02-01 16:46:40 +01:00
remote.h
replace-object.c
replace-object.h
repo-settings.c repo-settings: enable sparse index by default 2022-02-01 16:46:58 +01:00
repository.c
repository.h fsmonitor: config settings are repository-specific 2022-01-29 07:59:59 +01:00
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c backwards-compatibility: support the post-indexchanged hook 2022-02-01 16:46:38 +01:00
run-command.h Add a new run_hook_strvec() function 2022-02-01 16:46:36 +01:00
send-pack.c send-pack: do not check for sha1 file when GVFS_MISSING_OK set 2022-02-01 16:46:37 +01:00
send-pack.h
sequencer.c sequencer: avoid progress when stderr is redirected 2022-02-01 16:47:05 +01:00
sequencer.h
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1dc_git.c hash algorithms: use size_t for section lengths 2022-01-29 08:00:02 +01:00
sha1dc_git.h hash algorithms: use size_t for section lengths 2022-01-29 08:00:02 +01:00
shallow.c
shallow.h
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c sparse-index: complete partial expansion 2022-02-01 16:46:59 +01:00
sparse-index.h sparse-index: create expand_to_pattern_list() 2022-02-01 16:46:59 +01:00
split-index.c split-index: it really is incompatible with the sparse index 2022-02-01 16:46:34 +01:00
split-index.h
stable-qsort.c
strbuf.c strbuf_readlink: support link targets that exceed PATH_MAX 2022-01-29 08:00:25 +01:00
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() 2022-02-01 16:46:40 +01:00
sub-process.h sub-process: add subprocess_start_argv() 2022-02-01 16:46:40 +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 Always auto-gc after calling a fast-import transport 2022-01-29 07:59:53 +01:00
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: expand conditions for sparse result index 2022-02-01 16:47:06 +01:00
unpack-trees.h
upload-pack.c upload-pack: fix race condition in error messages 2022-02-01 16:46:42 +01:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
virtualfilesystem.c unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2022-02-01 16:46:42 +01:00
virtualfilesystem.h unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2022-02-01 16:46:42 +01:00
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c core.fsyncobjectfiles: add windows support for batch mode 2022-01-29 08:00:29 +01:00
write-or-die.c core.fsyncobjectfiles: batched disk flushes 2022-01-29 08:00:29 +01:00
ws.c
wt-status-deserialize.c wt-status-deserialize: fix crash when -v is used 2022-02-01 16:46:39 +01:00
wt-status-serialize.c gvfs:trace2:data: status serialization 2022-02-01 16:46:39 +01:00
wt-status.c status: bugfix directory diff in sparse index 2022-02-01 16:47:03 +01:00
wt-status.h gvfs:trace2:data: status deserialization information 2022-02-01 16:46:39 +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 may use the most recent Debian package. For example, you can download a specific version as follows:

wget -O microsoft-git.deb https://github.com/microsoft/git/releases/download/v2.33.0.vfs.0.0/microsoft-git_2.33.0.vfs.0.0.deb
sudo dpkg -i microsoft-git.deb

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 INCLUDE_SCALAR=YesPlease
sudo make -j12 prefix=/usr/local INCLUDE_SCALAR=YesPlease 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.