A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Derrick Stolee e24fde6bf1 fixup! reset: fix mixed reset when using virtual filesystem
This should fix #490, at least in the case that I've been able to
verify.

The issue is that reset was setting the skip-worktree bit more
frequently than it should have. The previous fix in #494 was focused on
the case where a file is added or removed across the diff. However, when
the file exists on both sides but still needs to be staged in a mixed
reset then we should avoid the skip-worktree bit.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
2024-06-03 21:17:10 +02:00
.github Merge upstream fix for osx-gcc job (#650) 2024-05-14 20:10:22 +02:00
Documentation scalar: make GVFS Protocol a forced choice 2024-05-14 20:10:18 +02:00
block-sha1
builtin fixup! reset: fix mixed reset when using virtual filesystem 2024-06-03 21:17:10 +02:00
ci Merge upstream fix for osx-gcc job (#650) 2024-05-14 20:10:22 +02:00
compat trace2: refactor setting process starting time 2024-05-14 20:09:59 +02:00
contrib scalar: adjust documentation to the microsoft/git fork 2024-05-14 20:10:08 +02:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
oss-fuzz
perl
po
refs
reftable
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
t fixup! scalar: add the `cache-server` command 2024-05-31 09:56:11 -04:00
templates
trace2 trace2:gvfs:experiment: increase default event depth for unpack-tree data 2024-05-14 20:10:00 +02:00
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes
.gitignore Merge pull request #329: Add `git update-microsoft-git` 2024-05-14 20:10:17 +02:00
.gitlab-ci.yml
.gitmodules
.mailmap
.tsan-suppressions
ARCHITECTURE.md
BRANCHES.md BRANCHES.md: Add explanation of branches and using forks 2024-05-14 20:09:57 +02:00
CODE_OF_CONDUCT.md
CONTRIBUTING.md
COPYING
GIT-VERSION-GEN gvfs: ensure that the version is based on a GVFS tag 2024-05-14 19:59:14 +02:00
INSTALL
LGPL-2.1
Makefile Merge pull request #371 from dscho/run-scalar-functional-tests-and-fix-built-in-fsmonitor 2024-05-14 20:10:17 +02:00
README.md Adjust README.md for microsoft/git 2024-05-14 20:10:06 +02:00
RelNotes
SECURITY.md
abspath.c abspath: make strip_last_path_component() global 2024-05-14 20:10:09 +02:00
abspath.h abspath: make strip_last_path_component() global 2024-05-14 20:10:09 +02: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 2024-05-14 20:09:56 +02:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
attr.c
attr.h
azure-pipelines.yml
banned.h
base85.c
base85.h
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 2024-05-14 20:10:05 +02:00
bulk-checkin.c
bulk-checkin.h
bundle-uri.c
bundle-uri.h
bundle.c
bundle.h
cache-tree.c trace2:gvfs:experiment: add region to cache_tree_fully_valid() 2024-05-14 20:10:00 +02:00
cache-tree.h
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 2024-05-14 19:59:14 +02:00
commit.h
common-main.c
config.c Merge branch 'scalar' 2024-05-14 20:10:07 +02:00
config.h Add virtual file system settings and hook proc 2024-05-14 20:09:57 +02:00
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
connected.c gvfs: allow "virtualizing" objects 2024-05-14 19:59:15 +02:00
connected.h
convert.c gvfs: ensure all filters and EOL conversions are blocked 2024-05-14 19:59:15 +02:00
convert.h
copy.c
copy.h
credential.c credential: add new interactive config option 2024-05-14 20:10:18 +02: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 2024-05-14 20:10:09 +02:00
diagnose.h
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c diff: ignore sparse paths in diffstat 2024-05-14 20:10:11 +02: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 Merge branch 'sparse-index-stuff' 2024-05-14 20:10:17 +02:00
dir.h
editor.c
editor.h
entry.c
entry.h
environment.c sha1-file: create shared-cache directory if it doesn't exist 2024-05-14 20:10:02 +02:00
environment.h sha1-file: create shared-cache directory if it doesn't exist 2024-05-14 20:10:02 +02:00
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-ll.h
fsmonitor-path-utils.h
fsmonitor-settings.c
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
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-zlib.c
git-zlib.h
git.c update-microsoft-git: create barebones builtin 2024-05-14 20:10:05 +02: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 2024-05-14 20:10:03 +02:00
gvfs-helper-client.h gvfs-helper: add prefetch support 2024-05-14 20:10:03 +02:00
gvfs-helper.c Merge pull request #371 from dscho/run-scalar-functional-tests-and-fix-built-in-fsmonitor 2024-05-14 20:10:17 +02:00
gvfs.c gvfs: allow overriding core.gvfs 2024-05-14 20:09:57 +02:00
gvfs.h fetch: use gvfs-helper prefetch under config 2024-05-14 20:10:03 +02:00
hash-ll.h
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c help: special-case HOST_CPU `universal` 2024-05-14 20:10:04 +02:00
help.h
hex-ll.c
hex-ll.h
hex.c
hex.h
hook.c backwards-compatibility: support the post-indexchanged hook 2024-05-14 20:09:57 +02:00
hook.h
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
ident.h
imap-send.c
iterator.h
json-parser.c scalar: implement a minimal JSON parser 2024-05-14 20:10:07 +02:00
json-parser.h scalar: implement a minimal JSON parser 2024-05-14 20:10:07 +02: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
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
lockfile.c
lockfile.h
log-tree.c
log-tree.h
loose.c
loose.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
match-trees.h
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ll.c
merge-ll.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 2024-05-14 20:09:58 +02:00
merge-recursive.h
merge.c
merge.h
mergesort.h
midx-write.c
midx.c
midx.h
name-hash.c unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2024-05-14 20:10:04 +02:00
name-hash.h unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2024-05-14 20:10:04 +02: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-convert.c
object-file-convert.h
object-file.c sha1-file: create shared-cache directory if it doesn't exist 2024-05-14 20:10:02 +02:00
object-file.h
object-name.c
object-name.h
object-store-ll.h sha1-file: add function to update existing loose object cache 2024-05-14 20:10:01 +02:00
object-store.h
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.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() 2024-05-14 20:10:01 +02:00
packfile.h packfile: add install_packed_git_and_mru() 2024-05-14 20:10:01 +02:00
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c
parse-options.h
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c
pathspec.h
pkt-line.c status: add status serialization mechanism 2024-05-14 20:09:57 +02:00
pkt-line.h status: add status serialization mechanism 2024-05-14 20:09:57 +02:00
preload-index.c
preload-index.h
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 2024-05-14 20:10:01 +02: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
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache-ll.h fsmonitor: check CE_FSMONITOR_VALID in ce_uptodate 2024-05-14 20:09:58 +02:00
read-cache.c add/rm: allow adding sparse entries when virtual 2024-05-14 20:10:10 +02:00
read-cache.h
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 2024-05-14 20:10:03 +02:00
remote.c Trace2:gvfs:experiment: capture more 'tracking' details 2024-05-14 20:10:00 +02:00
remote.h
replace-object.c
replace-object.h
repo-settings.c repo-settings: enable sparse index by default 2024-05-14 20:10:11 +02: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
sane-ctype.h
scalar.c fixup! scalar: add the `cache-server` command 2024-05-31 09:56:11 -04:00
send-pack.c send-pack: do not check for sha1 file when GVFS_MISSING_OK set 2024-05-14 20:09:56 +02:00
send-pack.h
sequencer.c sequencer: avoid progress when stderr is redirected 2024-05-14 20:02:02 +02:00
sequencer.h
serve.c
serve.h
server-info.c
server-info.h
setup.c
setup.h
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 sparse-index.c: fix use of index hashes in expand_index 2024-05-14 20:10:18 +02:00
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
statinfo.c
statinfo.h
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() 2024-05-14 20:10:01 +02:00
sub-process.h sub-process: add subprocess_start_argv() 2024-05-14 20:10:01 +02:00
submodule-config.c
submodule-config.h
submodule.c
submodule.h
symlinks.c
symlinks.h
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 2024-05-14 20:10:04 +02:00
unpack-trees.h
upload-pack.c
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
versioncmp.h
virtualfilesystem.c unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2024-05-14 20:10:04 +02:00
virtualfilesystem.h unpack-trees:virtualfilesystem: Improve efficiency of clear_ce_flags 2024-05-14 20:10:04 +02:00
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
wrapper.h
write-or-die.c
write-or-die.h
ws.c
ws.h
wt-status-deserialize.c gvfs:trace2:data: status deserialization information 2024-05-14 20:09:59 +02:00
wt-status-serialize.c gvfs:trace2:data: status serialization 2024-05-14 20:09:59 +02:00
wt-status.c status: serialize to path 2024-05-14 20:09:58 +02:00
wt-status.h gvfs:trace2:data: status deserialization information 2024-05-14 20:09:59 +02:00
xdiff-interface.c
xdiff-interface.h

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 install using the most recent Debian package. To download and validate the signature of this package, run the following:

# Install needed packages
apt-get install -y curl debsig-verify

# Download public key signature file
curl -s https://api.github.com/repos/microsoft/git/releases/latest \
| grep -E 'browser_download_url.*msft-git-public.asc' \
| cut -d : -f 2,3 \
| tr -d \" \
| xargs -I 'url' curl -L -o msft-git-public.asc 'url'

# De-armor public key signature file
gpg --output msft-git-public.gpg --dearmor msft-git-public.asc

# Note that the fingerprint of this key is "B8F12E25441124E1", which you can
# determine by running:
gpg --show-keys msft-git-public.asc | head -n 2 | tail -n 1 | tail -c 17

# Copy de-armored public key to debsig keyring folder
mkdir /usr/share/debsig/keyrings/B8F12E25441124E1
mv msft-git-public.gpg /usr/share/debsig/keyrings/B8F12E25441124E1/

# Create an appropriate policy file
mkdir /etc/debsig/policies/B8F12E25441124E1
cat > /etc/debsig/policies/B8F12E25441124E1/generic.pol << EOL
<?xml version="1.0"?>
<!DOCTYPE Policy SYSTEM "https://www.debian.org/debsig/1.0/policy.dtd">
<Policy xmlns="https://www.debian.org/debsig/1.0/">
  <Origin Name="Microsoft Git" id="B8F12E25441124E1" Description="Microsoft Git public key"/>
  <Selection>
    <Required Type="origin" File="msft-git-public.gpg" id="B8F12E25441124E1"/>
  </Selection>
  <Verification MinOptional="0">
    <Required Type="origin" File="msft-git-public.gpg" id="B8F12E25441124E1"/>
  </Verification>
</Policy>
EOL

# Download Debian package
curl -s https://api.github.com/repos/microsoft/git/releases/latest \
| grep "browser_download_url.*deb" \
| cut -d : -f 2,3 \
| tr -d \" \
| xargs -I 'url' curl -L -o msft-git.deb 'url'

# Verify
debsig-verify msft-git.deb

# Install
sudo dpkg -i msft-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
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.