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 Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -07:00
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 ewah: implement `bitmap_is_empty()` 2023-12-14 14:38:07 -08:00
git-gui git-gui--askyesno (mingw): use Git for Windows' icon, if available 2024-04-29 21:48:06 +02:00
gitk-git gitk: make the "list references" default window width wider 2024-04-29 21:48:06 +02:00
gitweb Merge branch 'mj/gitweb-unreadable-config-error' 2024-01-26 08:54:46 -08:00
mergetools mergetools: vimdiff: use correct tool's name when reading mergetool config 2024-02-19 08:45:14 -08:00
negotiator treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
oss-fuzz Merge branch 'rs/date-mode-pass-by-value' 2024-04-16 14:50:29 -07:00
perl Merge branch 'js/update-urls-in-doc-and-comment' 2023-12-18 14:10:12 -08:00
po Merge branch 'master' of github.com:alshopov/git-po 2024-04-29 14:50:23 +08:00
refs Introduce helper to create symlinks that knows about index_state 2024-04-29 21:48:13 +02:00
reftable Merge branch 'ps/reftable-block-iteration-optim' 2024-04-23 11:52:37 -07:00
sha1 avoid SHA-1 functions deprecated in OpenSSL 3+ 2023-08-01 08:34:56 -07:00
sha1collisiondetection@855827c583
sha1dc doc: refer to internet archive 2023-11-26 10:07:06 +09:00
sha256
t fixup! scalar: add the `cache-server` command 2024-05-31 09:56:11 -04:00
templates Merge branch 'jp/use-diff-index-in-pre-commit-sample' into maint-2.43 2024-02-08 16:22:02 -08:00
trace2 trace2:gvfs:experiment: increase default event depth for unpack-tree data 2024-05-14 20:10:00 +02:00
xdiff
.cirrus.yml Merge branch 'cb/use-freebsd-13-2-at-cirrus-ci' 2024-02-06 14:31:22 -08:00
.clang-format clang-format: fix typo in comment 2023-11-01 12:24:19 +09:00
.editorconfig editorconfig: add Makefiles to "text files" 2024-03-23 11:42:31 -07:00
.gitattributes gitattributes: mark .png files as binary 2024-04-29 21:48:13 +02:00
.gitignore Merge pull request #329: Add `git update-microsoft-git` 2024-05-14 20:10:17 +02:00
.gitlab-ci.yml ci: add jobs to test with the reftable backend 2024-02-07 08:28:37 -08:00
.gitmodules
.mailmap mailmap: change primary address for Linus Arver 2024-04-16 22:25:11 -07:00
.tsan-suppressions
ARCHITECTURE.md Describe Git for Windows' architecture [no ci] 2024-04-29 21:48:15 +02:00
BRANCHES.md BRANCHES.md: Add explanation of branches and using forks 2024-05-14 20:09:57 +02:00
CODE_OF_CONDUCT.md Modify the Code of Conduct for Git for Windows 2024-04-29 21:48:16 +02:00
CONTRIBUTING.md CONTRIBUTING.md: add guide for first-time contributors 2024-04-29 21:48:16 +02:00
COPYING
GIT-VERSION-GEN gvfs: ensure that the version is based on a GVFS tag 2024-05-14 19:59:14 +02:00
INSTALL Sync with 2.42.2 2024-04-19 12:38:50 +02:00
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 Git 2.45.1 2024-04-29 20:42:46 +02:00
SECURITY.md SECURITY.md: document Git for Windows' policies 2024-04-29 21:48:16 +02:00
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: plug a leak in get_untracked_files 2024-04-22 16:27:42 -07:00
add-interactive.h
add-patch.c add-patch: plug a leak handling the '/' command 2024-04-22 16:27:42 -07:00
advice.c Merge branch 'deprecate-core.useBuiltinFSMonitor' 2024-04-29 21:48:19 +02:00
advice.h Merge branch 'deprecate-core.useBuiltinFSMonitor' 2024-04-29 21:48:19 +02:00
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 use xstrncmpz() 2024-02-12 09:32:41 -08:00
archive-zip.c archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
archive.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
archive.h archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
attr.c attr: add builtin objectmode values support 2023-12-28 13:21:52 -08:00
attr.h attr: add attr.tree for setting the treeish to read attributes from 2023-10-13 11:43:29 -07:00
azure-pipelines.yml azure-pipeline: run static-analysis on jammy 2024-04-29 21:47:21 +02:00
banned.h
base85.c
base85.h
bisect.c bisect: report the found commit with "show" 2024-04-15 11:29:09 -07:00
bisect.h
blame.c blame.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
blame.h blame.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
blob.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
blob.h blob: drop unused parts of parse_blob_buffer() 2022-12-13 22:16:22 +09:00
bloom.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bloom.h
branch.c Merge branch 'pf/commitish-committish' 2024-04-19 09:13:47 -07:00
branch.h typo: replace 'commitish' with 'committish' 2024-04-11 15:14:56 -07:00
builtin.h update-microsoft-git: create barebones builtin 2024-05-14 20:10:05 +02:00
bulk-checkin.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bulk-checkin.h bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -07:00
bundle-uri.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
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: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
chunk-format.h chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
color.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
color.h
column.c column: guard against negative padding 2024-02-13 10:18:57 -08:00
column.h
combine-diff.c Merge branch 'js/check-null-from-read-object-file' 2024-02-14 15:36:06 -08:00
command-list.txt replay: introduce new builtin 2023-11-26 10:10:48 +09:00
commit-graph.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
commit-graph.h Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' 2023-11-08 11:03:59 +09:00
commit-reach.c commit-reach(repo_get_merge_bases_many_dirty): pass on errors 2024-02-29 08:06:01 -08:00
commit-reach.h commit-reach(repo_get_merge_bases_many_dirty): pass on errors 2024-02-29 08:06:01 -08:00
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 Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
common-main.c common-main.c: fflush stdout buffer upon exit 2024-04-29 21:47:23 +02:00
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 mimalloc: offer a build-time option to enable it 2024-04-29 21:47:14 +02:00
config.mak.in
config.mak.uname mingw: optionally enable wsl compability file mode bits 2024-04-29 21:48:14 +02:00
configure.ac global: convert trivial usages of `test <expr> -a/-o <expr>` 2023-11-11 09:21:00 +09:00
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 config: use git_config_string() for core.checkRoundTripEncoding 2023-12-09 08:26:22 +09:00
copy.c Sync with 2.41.1 2024-04-19 12:38:46 +02:00
copy.h Sync with 2.40.2 2024-04-19 12:38:42 +02:00
credential.c credential: add new interactive config option 2024-05-14 20:10:18 +02:00
credential.h
csum-file.c Merge branch 'ew/hash-with-openssl-evp' 2023-09-13 10:07:57 -07:00
csum-file.h
ctype.c
daemon.c daemon: free listen_addr before returning 2023-10-05 14:54:58 -07:00
date.c date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
date.h date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
decorate.c decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
decorate.h decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
delta-islands.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
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 revision: optionally record matches with pathspec elements 2024-04-03 14:55:21 -07:00
diff-merges.c diff-merges: introduce '--dd' option 2023-10-09 12:47:29 -07:00
diff-merges.h
diff-no-index.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diff.c diff: ignore sparse paths in diffstat 2024-05-14 20:10:11 +02:00
diff.h diff --stat: set the width defaults in a helper function 2023-09-29 15:46:06 -07:00
diffcore-break.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diffcore-delta.c Merge branch 'en/diffcore-delta-final-line-fix' into maint-2.43 2024-02-13 14:44:48 -08:00
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir-iterator.h dir-iterator: support iteration in sorted order 2024-02-21 09:58:05 -08:00
dir.c Merge branch 'sparse-index-stuff' 2024-05-14 20:10:17 +02:00
dir.h Sync with 2.44.1 2024-04-29 20:42:30 +02:00
editor.c Partially un-revert "editor: save and reset terminal after calling EDITOR" 2024-04-29 21:48:15 +02:00
editor.h
entry.c Git 2.45.1 2024-05-02 19:20:50 +02:00
entry.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
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 treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c fscache: fscache takes an initial size 2024-04-29 21:48:05 +02:00
fetch-pack.h treewide: remove unnecessary includes from header files 2023-12-26 12:04:31 -08:00
fmt-merge-msg.c prefer comment_line_str to comment_line_char for printing 2024-03-12 13:28:10 -07:00
fmt-merge-msg.h
fsck.c Sync with 2.44.1 2024-04-29 20:42:30 +02:00
fsck.h Sync with 2.42.2 2024-04-19 12:38:50 +02:00
fsmonitor--daemon.h fsmonitor--daemon.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
fsmonitor-ipc.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:33 -08:00
fsmonitor-ipc.h
fsmonitor-ll.h
fsmonitor-path-utils.h fsmonitor: deal with synthetic firmlinks on macOS 2022-10-05 11:05:23 -07:00
fsmonitor-settings.c fsmonitor: reintroduce core.useBuiltinFSMonitor 2024-04-29 21:48:15 +02:00
fsmonitor-settings.h
fsmonitor.c fsmonitor: support case-insensitive events 2024-03-06 09:10:06 -08:00
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
gettext.h
git-archimport.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-compat-util.h Introduce helper to create symlinks that knows about index_state 2024-04-29 21:48:13 +02:00
git-curl-compat.h http: optionally send SSL client certificate 2024-04-29 21:47:18 +02:00
git-cvsexportcommit.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-cvsimport.perl Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
git-cvsserver.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-difftool--helper.sh git-difftool--helper: honor `--trust-exit-code` with `--dir-diff` 2024-02-20 09:30:32 -08:00
git-filter-branch.sh
git-instaweb.sh doc: switch links to https 2023-11-26 10:07:05 +09:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh mergetool: new config guiDefault supports auto-toggling gui by DISPLAY 2023-04-05 21:03:29 -07:00
git-p4.py Merge branch 'jt/p4-spell-re-with-raw-string' 2024-02-06 14:31:20 -08:00
git-quiltimport.sh git-quiltimport: avoid an unnecessary subshell 2024-03-16 11:08:57 -07:00
git-request-pull.sh
git-send-email.perl Merge branch 'tz/send-email-negatable-options' into maint-2.43 2024-02-08 16:22:01 -08:00
git-sh-i18n.sh
git-sh-setup.sh mingw: only use Bash-ism `builtin pwd -W` when available 2024-04-29 21:48:14 +02:00
git-submodule.sh
git-svn.perl Merge branch 'tz/send-email-negatable-options' into maint-2.43 2024-02-08 16:22:01 -08:00
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 ARM64: Embed manifest properly (#4718) 2024-04-29 21:47:33 +02:00
gpg-interface.c Unbreak interactive GPG prompt upon signing 2024-04-29 21:48:11 +02:00
gpg-interface.h tag: fix sign_buffer() call to create a signed tag 2024-02-07 10:47:25 -08:00
graph.c diff --stat: add config option to limit filename width 2023-09-18 09:39:07 -07:00
graph.h doc: switch links to https 2023-11-26 10:07:05 +09:00
grep.c grep: improve errors for unmatched ( and ) 2024-03-25 11:40:53 -07:00
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 object-names: support input of oids in any supported hash 2023-10-02 14:57:38 -07:00
hash-lookup.c
hash-lookup.h
hash.h cache: add a function to read an OID of a specific algorithm 2023-10-02 14:57:39 -07:00
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: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex-ll.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hook.c backwards-compatibility: support the post-indexchanged hook 2024-05-14 20:09:57 +02:00
hook.h
http-backend.c http-backend: new rpc-service for git-upload-archive 2024-01-22 07:54:37 -08:00
http-fetch.c http.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
http-push.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
http-walker.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
http.c http: optionally send SSL client certificate 2024-04-29 21:47:18 +02:00
http.h http.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
ident.c
ident.h
imap-send.c imap-send: increase command size limit 2024-04-15 11:34:17 -07:00
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 doc: switch links to https 2023-11-26 10:07:05 +09:00
khash.h hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
kwset.c doc: switch links to https 2023-11-26 10:07:05 +09:00
kwset.h doc: switch links to https 2023-11-26 10:07:05 +09:00
levenshtein.c
levenshtein.h
line-log.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:33 -08:00
line-log.h line-log.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
line-range.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
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 treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
list-objects-filter-options.h
list-objects-filter.c oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
list-objects-filter.h
list-objects.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
list-objects.h
list.h doc: switch links to https 2023-11-26 10:07:05 +09:00
lockfile.c lockfile.c: use is_dir_sep() instead of hardcoded '/' checks 2024-04-29 21:48:11 +02:00
lockfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
log-tree.c Merge branch 'rs/date-mode-pass-by-value' 2024-04-16 14:50:29 -07:00
log-tree.h format-patch: return an allocated string from log_write_email_headers() 2024-03-19 17:54:16 -07:00
loose.c loose: compatibilty short name support 2023-10-02 14:57:38 -07:00
loose.h loose: add a mapping between SHA-1 and SHA-256 for loose objects 2023-10-02 14:57:38 -07:00
ls-refs.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
ls-refs.h
mailinfo.c Merge branch 'jk/mailinfo-iterative-unquote-comment' into maint-2.43 2024-02-08 16:22:03 -08:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c tree-walk: init_tree_desc take an oid to get the hash algorithm 2023-10-02 14:57:40 -07:00
match-trees.h
mem-pool.c mem_pool: add GIT_TRACE_MEMPOOL support 2024-04-29 21:47:58 +02:00
mem-pool.h mem-pool: add mem_pool_strfmt() 2024-02-26 09:35:40 -08:00
merge-blobs.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
merge-blobs.h
merge-ll.c Merge branch 'pw/checkout-conflict-errorfix' 2024-04-01 13:21:33 -07:00
merge-ll.h merge options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'pw/checkout-conflict-errorfix' 2024-04-01 13:21:33 -07:00
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 options: add a conflict style member 2024-03-14 10:08:52 -07:00
merge.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
merge.h
mergesort.h
midx-write.c midx-write.c: use `--stdin-packs` when repacking 2024-04-01 14:18:17 -07:00
midx.c Merge branch 'ps/missing-btmp-fix' 2024-04-23 11:52:40 -07:00
midx.h midx-write: move writing-related functions from midx.c 2024-04-01 14:18:16 -07:00
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 object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
notes-cache.h notes-cache.c: remove the_repository references 2018-11-12 14:50:06 +09:00
notes-merge.c commit-reach(repo_get_merge_bases): pass on "missing commits" errors 2024-02-29 08:06:01 -08:00
notes-merge.h
notes-utils.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
notes-utils.h
notes.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
notes.h
object-file-convert.c object-file-convert: convert commits that embed signed tags 2023-10-02 14:57:39 -07:00
object-file-convert.h object-file-convert: stubs for converting from one object format to another 2023-10-02 14:57:38 -07:00
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 Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
object-name.h object-names: support input of oids in any supported hash 2023-10-02 14:57:38 -07:00
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 Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
object.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
oid-array.c oid-array: teach oid-array to handle multiple kinds of oids 2023-10-02 14:57:38 -07:00
oid-array.h
oidmap.c
oidmap.h
oidset.c oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
oidset.h oidset: refactor oidset_insert_from_set() 2024-02-14 09:39:14 -08:00
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
pack-bitmap.c Merge branch 'ps/missing-btmp-fix' 2024-04-23 11:52:40 -07:00
pack-bitmap.h pack-bitmap: enable reuse from all bitmapped packs 2023-12-14 14:38:09 -08:00
pack-check.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
pack-mtimes.c
pack-mtimes.h
pack-objects.c pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-objects.h pack-objects: free packing_data in more places 2023-12-14 14:38:07 -08:00
pack-revindex.c pack-revindex: implement `midx_pair_to_pack_pos()` 2023-12-14 14:38:08 -08:00
pack-revindex.h pack-revindex: implement `midx_pair_to_pack_pos()` 2023-12-14 14:38:08 -08:00
pack-write.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
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 checkout.c: enable fscache for checkout again 2024-04-29 21:47:36 +02:00
parallel-checkout.h
parse-options-cb.c parse-options: mark unused parameters in noop callback 2023-09-05 14:48:17 -07:00
parse-options.c parse-options: rearrange long_name matching code 2024-03-03 09:49:22 -08:00
parse-options.h parse-options: make CMDMODE errors more precise 2023-10-29 09:15:18 +09:00
parse.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
parse.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
patch-delta.c
patch-ids.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
patch-ids.h
path.c Git 2.45.1 2024-05-02 19:20:50 +02:00
path.h clean: do not traverse mount points 2024-04-29 21:47:13 +02:00
pathspec.c attr: enable attr pathspec magic for git-add and git-stash 2023-11-04 17:00:27 +09:00
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 fscache: update fscache to be thread specific instead of global 2024-04-29 21:48:05 +02:00
preload-index.h
pretty.c Merge branch 'rs/date-mode-pass-by-value' 2024-04-16 14:50:29 -07:00
pretty.h Merge branch 'rs/date-mode-pass-by-value' 2024-04-16 14:50:29 -07:00
prio-queue.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
prio-queue.h
progress.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
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 git add -i: handle CR/LF line endings in the interactive input 2024-04-29 21:47:16 +02:00
prompt.h
protocol-caps.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
protocol-caps.h serve.[ch]: don't pass "struct strvec *keys" to commands 2021-08-05 08:59:37 -07:00
protocol.c
protocol.h doc: switch links to https 2023-11-26 10:07:05 +09:00
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c Merge branch 'kh/range-diff-notes' 2023-09-29 09:04:15 -07:00
range-diff.h
reachable.c prune: mark rebase autostash and orig-head as reachable 2024-02-09 10:04:59 -08:00
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 strbuf: accept a comment string for strbuf_add_commented_lines() 2024-03-12 13:28:10 -07:00
rebase-interactive.h
rebase.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
rebase.h
ref-filter.c date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
ref-filter.h for-each-ref: add new option to include root refs 2024-02-23 10:36:28 -08:00
reflog-walk.c date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
reflog-walk.h date: make DATE_MODE thread-safe 2024-04-05 15:21:14 -07:00
reflog.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
reflog.h
refs.c Merge branch 'kn/for-all-refs' 2024-03-05 09:44:44 -08:00
refs.h refs/reftable: expose auto compaction via new flag 2024-03-25 09:54:07 -07:00
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 Merge branch 'jc/retire-cas-opt-name-constant' into maint-2.43 2024-02-08 16:22:09 -08:00
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 Git 2.45.1 2024-05-02 19:20:50 +02:00
repository.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
rerere.c Merge branch 'mr/rerere-crash-fix' 2024-04-23 11:52:41 -07:00
rerere.h
reset.c Merge branch 'js/merge-tree-3-trees' 2024-03-07 15:59:41 -08:00
reset.h
resolve-undo.c Merge branch 'jc/unresolve-removal' 2023-10-02 11:20:00 -07:00
resolve-undo.h
revision.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
revision.h revision: optionally record matches with pathspec elements 2024-04-03 14:55:21 -07:00
run-command.c run-command: introduce function to prepare auto-maintenance process 2024-04-17 08:42:26 -07:00
run-command.h run-command: introduce function to prepare auto-maintenance process 2024-04-17 08:42:26 -07:00
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 send-pack.c: add config push.useBitmaps 2022-06-17 14:31:01 -07:00
sequencer.c sequencer: avoid progress when stderr is redirected 2024-05-14 20:02:02 +02:00
sequencer.h rebase -i: stop setting GIT_CHERRY_PICK_HELP 2024-02-27 10:33:36 -08:00
serve.c upload-pack: disallow object-info capability by default 2024-02-28 14:42:01 -08:00
serve.h
server-info.c
server-info.h
setup.c Git 2.45.1 2024-05-02 19:20:50 +02:00
setup.h Sync with 2.44.1 2024-04-29 20:42:30 +02:00
sh-i18n--envsubst.c doc: switch links to https 2023-11-26 10:07:05 +09:00
sha1dc_git.c hash algorithms: use size_t for section lengths 2024-04-29 21:47:19 +02:00
sha1dc_git.h hash algorithms: use size_t for section lengths 2024-04-29 21:47:19 +02:00
shallow.c commit-reach(repo_in_merge_bases_many): report missing commits 2024-02-28 09:47:03 -08:00
shallow.h
shared.mak Makefile: simplify output of the libpath_template 2024-01-31 14:43:00 -08:00
shell.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
shortlog.h
sideband.c sideband: avoid short write(2) 2024-03-02 11:12:16 -08:00
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 Merge branch 'jc/fake-lstat' 2023-12-27 14:52:24 -08:00
statinfo.h cache: add fake_lstat() 2023-09-15 17:08:46 -07:00
strbuf.c strbuf_readlink: support link targets that exceed PATH_MAX 2024-04-29 21:48:11 +02:00
strbuf.h Merge branch 'jk/core-comment-string' 2024-04-05 10:49:49 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c strvec: drop unnecessary include of hex.h 2023-11-03 08:26:55 +09:00
strvec.h strvec: use correct member name in comments 2024-01-12 13:38:07 -08:00
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 config: add --comment option to add a comment 2024-03-15 12:25:35 -07:00
submodule-config.h Merge branch 'vd/fsck-submodule-url-test' 2024-01-26 08:54:47 -08:00
submodule.c Sync with 2.44.1 2024-04-29 20:42:30 +02:00
submodule.h Sync with 2.39.4 2024-04-19 12:38:37 +02:00
symlinks.c
symlinks.h
tag.c
tag.h
tar.h
tempfile.c lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
tempfile.h lockfile: report when rollback fails 2024-03-07 12:34:13 -08:00
thread-utils.c treewide: remove unnecessary cache.h includes in source files 2023-02-23 17:25:28 -08:00
thread-utils.h
tmp-objdir.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
tmp-objdir.h
trace.c doc: switch links to https 2023-11-26 10:07:05 +09:00
trace.h
trace2.c trace2: emit 'def_param' set with 'cmd_name' event 2024-03-07 10:24:34 -08:00
trace2.h trace2: fix signature of trace2_def_param() macro 2023-11-23 10:30:32 +09:00
trailer.c Merge branch 'la/format-trailer-info' 2024-04-23 11:52:39 -07:00
trailer.h trailer: finish formatting unification 2024-03-15 10:10:25 -07:00
transport-helper.c Always auto-gc after calling a fast-import transport 2024-04-29 21:47:13 +02:00
transport-internal.h
transport.c Merge branch 'es/some-up-to-date-messages-must-stay' 2024-01-26 08:54:45 -08:00
transport.h
tree-diff.c tree-diff: respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree-walk.h Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree.c Merge branch 'eb/hash-transition' 2024-03-28 14:13:50 -07:00
tree.h read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
unicode-width.h unicode: update the width tables to Unicode 15.1 2023-09-25 16:17:28 -07:00
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 tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
upload-pack.c Merge branch 'jk/upload-pack-v2-capability-cleanup' 2024-03-07 15:59:42 -08:00
upload-pack.h
url.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
url.h
urlmatch.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
urlmatch.h
usage.c usage: report vsnprintf(3) failure 2024-04-05 15:16:27 -07:00
userdiff.c userdiff: better method/property matching for C# 2024-04-05 15:21:43 -07:00
userdiff.h
utf8.c doc: switch links to https 2023-11-26 10:07:05 +09:00
utf8.h doc: switch links to https 2023-11-26 10:07:05 +09:00
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 tree-walk: init_tree_desc take an oid to get the hash algorithm 2023-10-02 14:57:40 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c config: add --comment option to add a comment 2024-03-15 12:25:35 -07:00
worktree.h worktree: expose interface to look up worktree by name 2024-01-08 13:17:30 -08:00
wrap-for-bin.sh
wrapper.c don't report vsnprintf(3) error as bug 2024-04-21 12:27:07 -07:00
wrapper.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
write-or-die.c write-or-die: fix the polarity of GIT_FLUSH environment variable 2024-02-13 11:57:28 -08:00
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: refactor parsing of merge.conflictstyle 2024-03-14 10:08:52 -07:00
xdiff-interface.h xdiff-interface: refactor parsing of merge.conflictstyle 2024-03-14 10:08:52 -07:00

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.