A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Derrick Stolee c87e535e5a diff: ignore sparse paths in diffstat
The diff_populate_filespec() method is used to describe the diff after a
merge operation is complete, especially when a conflict appears. In
order to avoid expanding a sparse index, the reuse_worktree_file() needs
to be adapted to ignore files that are outside of the sparse-checkout
cone. The file names and OIDs used for this check come from the merged
tree in the case of the ORT strategy, not the index, hence the ability
to look into these paths without having already expanded the index.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
2023-03-14 10:33:05 +01:00
.github Merge 'readme' into HEAD 2023-03-13 18:23:49 +01:00
Documentation sparse-checkout: add config to disable deleting dirs 2023-03-14 10:33:05 +01:00
block-sha1 Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -07:00
builtin sparse-checkout: add config to disable deleting dirs 2023-03-14 10:33:05 +01:00
ci Merge branch 'ci-fixes' 2023-03-13 18:23:38 +01:00
compat Merge pull request #3492 from dscho/ns/batched-fsync 2023-03-13 18:23:48 +01:00
contrib mingw: add a cache below mingw's lstat and dirent implementations 2023-03-13 18:23:39 +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
mergetools
negotiator negotiator/skipping: avoid stack overflow 2022-10-25 17:14:40 -07:00
oss-fuzz Merge branch 'ac/fuzzers' 2022-10-07 17:19:59 -07:00
perl Git.pm: trust rev-parse to find bare repositories 2022-10-22 16:39:48 -07:00
po Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po 2023-03-10 22:50:14 +08:00
refs Introduce helper to create symlinks that knows about index_state 2023-03-13 18:23:45 +01:00
reftable reftable: use a pointer for pq_entry param 2022-09-15 11:32:37 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256
t sparse-checkout: add config to disable deleting dirs 2023-03-14 10:33:05 +01:00
templates
trace2 trace2: add global counter mechanism 2022-10-24 12:45:26 -07:00
xdiff xdiff: mark unused parameter in xdl_call_hunk_func() 2022-12-13 22:16:23 +09:00
.cirrus.yml
.clang-format
.editorconfig
.gitattributes gitattributes: mark .png files as binary 2023-03-13 18:23:45 +01:00
.gitignore .gitignore: add Visual Studio CMakeSetting.json file 2023-03-13 18:23:32 +01:00
.gitmodules
.mailmap mailmap: update email address of Matheus Tavares 2022-12-10 09:17:36 +09:00
.tsan-suppressions
ARCHITECTURE.md Describe Git for Windows' architecture [no ci] 2023-03-13 18:23:46 +01:00
CODE_OF_CONDUCT.md Modify the Code of Conduct for Git for Windows 2023-03-13 18:23:47 +01:00
CONTRIBUTING.md CONTRIBUTING.md: add guide for first-time contributors 2023-03-13 18:23:47 +01:00
COPYING
GIT-VERSION-GEN Git 2.40 2023-03-12 14:34:41 -07:00
INSTALL add: remove "add.interactive.useBuiltin" & Perl "git add--interactive" 2023-02-06 15:03:34 -08:00
LGPL-2.1
Makefile test-tool: learn to act as a drop-in replacement for `iconv` 2023-03-13 18:23:45 +01:00
README.md README.md: Add a Windows-specific preamble 2023-03-13 18:23:47 +01:00
RelNotes Prepare for 2.39.3 just in case 2023-02-14 14:15:57 -08:00
SECURITY.md SECURITY.md: document Git for Windows' policies 2023-03-13 18:23:47 +01:00
abspath.c strbuf_realpath(): use platform-dependent API if available 2023-03-13 18:23:30 +01:00
aclocal.m4
add-interactive.c diff: mark unused parameters in callbacks 2022-12-13 22:16:23 +09:00
add-interactive.h
add-patch.c read-cache API & users: make discard_index() return void 2022-11-21 12:06:15 +09:00
advice.c Merge branch 'deprecate-core.useBuiltinFSMonitor' 2023-03-13 18:23:48 +01:00
advice.h Merge branch 'deprecate-core.useBuiltinFSMonitor' 2023-03-13 18:23:48 +01:00
alias.c alias.c: reject too-long cmdline strings in split_cmdline() 2022-10-01 00:23:38 -04:00
alias.h
alloc.c
alloc.h
apply.c Introduce helper to create symlinks that knows about index_state 2023-03-13 18:23:45 +01:00
apply.h
archive-tar.c archive-tar: report filter start error only once 2022-10-30 19:50:43 -04:00
archive-zip.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
archive.c Merge branch 'rs/archive-mtime' 2023-02-27 10:08:57 -08:00
archive.h archive: add --mtime 2023-02-18 09:29:13 -08:00
attr.c Merge branch 'kn/attr-from-tree' 2023-01-23 13:39:51 -08:00
attr.h attr: fix instructions on how to check attrs 2023-01-26 14:16:48 -08:00
azure-pipelines.yml azure-pipeline: run static-analysis on jammy 2023-03-13 18:23:33 +01:00
banned.h
base85.c
bisect.c bisect: no longer try to clean up left-over `.git/head-name` files 2023-01-13 14:17:14 -08:00
bisect.h
blame.c
blame.h
blob.c blob: drop unused parts of parse_blob_buffer() 2022-12-13 22:16:22 +09:00
blob.h blob: drop unused parts of parse_blob_buffer() 2022-12-13 22:16:22 +09:00
bloom.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
bloom.h
branch.c branch: improve advice when --recurse-submodules fails 2023-01-18 15:13:21 -08:00
branch.h
builtin.h read-tree: add "--super-prefix" option, eliminate global 2022-12-26 10:21:44 +09: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 clone: set fetch.bundleURI if appropriate 2023-01-31 08:57:48 -08:00
bundle.c Merge branch 'ab/various-leak-fixes' 2023-02-22 14:55:45 -08:00
bundle.h Merge branch 'ds/bundle-uri-3' 2022-10-30 21:04:44 -04:00
cache-tree.c Merge branch 'rs/cache-tree-strbuf-growth-fix' 2023-02-22 14:55:44 -08:00
cache-tree.h cache-tree API: remove redundant update_main_cache_tree() 2023-02-10 11:38:14 -08:00
cache.h clean: do not traverse mount points 2023-03-13 18:23:29 +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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
color.h
column.c utf8: fix truncated string lengths in `utf8_strnwidth()` 2022-12-09 14:26:21 +09:00
column.h
combine-diff.c diff: mark unused parameters in callbacks 2022-12-13 22:16:23 +09:00
command-list.txt version: fix builtin linking & documentation 2022-09-19 17:28:25 -07:00
commit-graph.c use DUP_ARRAY 2023-01-09 13:28:36 +09:00
commit-graph.h
commit-reach.c use DUP_ARRAY 2023-01-09 13:28:36 +09:00
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'rs/clear-commit-marks-cleanup' into maint-2.39 2023-02-14 14:15:56 -08:00
commit.h add API: remove run_add_interactive() wrapper function 2023-02-06 15:03:34 -08:00
common-main.c grep: fix multibyte regex handling under macOS 2022-08-26 11:45:52 -07:00
config.c init: do parse _all_ core.* settings early 2023-03-13 18:23:32 +01:00
config.h init: do parse _all_ core.* settings early 2023-03-13 18:23:32 +01:00
config.mak.dev mimalloc: offer a build-time option to enable it 2023-03-13 18:23:30 +01:00
config.mak.in
config.mak.uname mingw: add a Makefile target to copy test artifacts 2023-03-13 18:23:46 +01:00
configure.ac Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -07:00
connect.c Merge branch 'ds/bundle-uri-4' 2023-01-02 21:37:18 +09:00
connect.h server_supports_v2(): use a separate function for die_on_error 2022-12-13 22:08:52 +09:00
connected.c Merge branch 'ab/various-leak-fixes' 2022-12-14 15:55:46 +09:00
connected.h receive-pack: only use visible refs for connectivity check 2022-11-17 16:22:52 -05:00
convert.c attr: add flag `--source` to work with tree-ish 2023-01-14 08:49:55 -08:00
convert.h
copy.c
credential.c credential: new attribute password_expiry_utc 2023-02-22 15:18:58 -08:00
credential.h credential: new attribute password_expiry_utc 2023-02-22 15:18:58 -08:00
csum-file.c hashfile: allow skipping the hash function 2023-01-07 07:46:14 +09:00
csum-file.h hashfile: allow skipping the hash function 2023-01-07 07:46:14 +09:00
ctype.c
daemon.c
date.c date.c: allow ISO 8601 reduced precision times 2023-01-13 11:49:04 -08:00
date.h
decorate.c
decorate.h
delta-islands.c delta-islands: fix segfault when freeing island marks 2023-02-21 09:15:04 -08:00
delta-islands.h delta-islands: free island_marks and bitmaps 2023-02-03 18:01:46 -08:00
delta.h
detect-compiler
diagnose.c diagnose.c: refactor to safely use 'd_type' 2022-09-19 10:25:01 -07:00
diagnose.h builtin/diagnose.c: add '--mode' option 2022-08-12 13:20:02 -07:00
diff-delta.c
diff-lib.c diff: mark unused parameters in callbacks 2022-12-13 22:16:23 +09:00
diff-merges.c diff-merges: cleanup set_diff_merges() 2022-09-16 09:21:43 -07:00
diff-merges.h
diff-no-index.c diff: factor out add_diff_options() 2022-12-02 08:25:29 +09:00
diff.c diff: ignore sparse paths in diffstat 2023-03-14 10:33:05 +01:00
diff.h Merge branch 'jc/diff-algo-attribute' 2023-02-27 10:08:56 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe: mark unused parameters in pickaxe functions 2022-10-17 21:24:04 -07:00
diffcore-rename.c
diffcore-rotate.c
diffcore.h line-log: free diff queue when processing non-merge commits 2022-11-02 20:16:34 -04:00
dir-iterator.c dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS` 2023-02-16 16:21:56 -08:00
dir-iterator.h dir-iterator: drop unused `DIR_ITERATOR_FOLLOW_SYMLINKS` 2023-02-16 16:21:56 -08:00
dir.c dir.c: regression fix for add_excludes with fscache 2023-03-13 18:23:40 +01:00
dir.h dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache" 2022-11-21 12:32:48 +09:00
editor.c Partially un-revert "editor: save and reset terminal after calling EDITOR" 2023-03-13 18:23:46 +01:00
entry.c Introduce helper to create symlinks that knows about index_state 2023-03-13 18:23:45 +01:00
entry.h read-tree: add "--super-prefix" option, eliminate global 2022-12-26 10:21:44 +09:00
environment.c read-tree: add "--super-prefix" option, eliminate global 2022-12-26 10:21:44 +09:00
environment.h
exec-cmd.c mark unused parameters in trivial compat functions 2022-10-17 21:24:03 -07:00
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c fetch-pack.c: enable fscache for stats under .git/objects 2023-03-13 18:23:40 +01:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c fsck: do not assume NUL-termination of buffers 2023-01-19 15:39:43 -08:00
fsck.h fsck: provide a function to fsck buffer without object struct 2023-01-18 12:59:44 -08:00
fsmonitor--daemon.h fsmonitor: deal with synthetic firmlinks on macOS 2022-10-05 11:05:23 -07:00
fsmonitor-ipc.c replace and remove run_command_v_opt_tr2() 2022-10-30 14:04:48 -04:00
fsmonitor-ipc.h fsmonitor: relocate socket file if .git directory is remote 2022-10-05 11:05:22 -07:00
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 2023-03-13 18:23:46 +01:00
fsmonitor-settings.h fsmonitor: check for compatability before communicating with fsmonitor 2022-10-05 11:05:23 -07:00
fsmonitor.c treewide: always have a valid "index_state.repo" member 2023-01-17 14:32:06 -08:00
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c grep: fix multibyte regex handling under macOS 2022-08-26 11:45:52 -07:00
gettext.h
git-archimport.perl
git-compat-util.h Introduce helper to create symlinks that knows about index_state 2023-03-13 18:23:45 +01:00
git-curl-compat.h http: optionally send SSL client certificate 2023-03-13 18:23:32 +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 request-pull: filter out SSH/X.509 tag signatures 2023-01-25 15:54:41 -08:00
git-send-email.perl send-email: relay '-v N' to format-patch 2022-11-27 10:21:43 +09:00
git-sh-i18n.sh
git-sh-setup.sh mingw: only use Bash-ism `builtin pwd -W` when available 2023-03-13 18:23:45 +01:00
git-submodule.sh Merge branch 'ss/pull-v-recurse-fix' 2022-12-28 12:06:17 +09:00
git-svn.perl
git-web--browse.sh
git.c trace.c, git.c: remove unnecessary parameter to trace_repo_setup() 2023-02-21 12:06:32 -08:00
git.rc Fix Windows version resources 2023-03-13 18:23:33 +01:00
gpg-interface.c Unbreak interactive GPG prompt upon signing 2023-03-13 18:23:44 +01:00
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'ab/various-leak-fixes' 2023-02-22 14:55:45 -08:00
grep.h Merge branch 'ab/grep-simplify-extended-expression' 2022-10-21 11:37:28 -07:00
hash-lookup.c
hash-lookup.h
hash.h Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -07:00
hashmap.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
hashmap.h
help.c help.c: fix autocorrect in work tree for bare repository 2022-12-13 10:01:53 +09:00
help.h
hex.c
hook.c hook API: support passing stdin to hooks, convert am's 'post-rewrite' 2023-02-08 12:50:03 -08:00
hook.h hook API: support passing stdin to hooks, convert am's 'post-rewrite' 2023-02-08 12:50:03 -08:00
http-backend.c http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}() 2023-02-06 15:34:38 -08:00
http-fetch.c http-fetch: invoke trace2_cmd_name() 2022-12-13 10:43:07 +09:00
http-push.c Sync with 2.36.5 2023-02-06 09:38:31 +01:00
http-walker.c
http.c http: optionally send SSL client certificate 2023-03-13 18:23:32 +01:00
http.h Sync with 2.37.6 2023-02-06 09:43:28 +01:00
ident.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
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: free the diff queues' arrays when processing merge commits 2022-11-02 20:16:34 -04:00
line-log.h
line-range.c line-range: fix infinite loop bug with '$' regex 2022-12-20 10:00:43 +09:00
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT() 2022-11-30 10:00:35 +09:00
list-objects-filter-options.h list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT() 2022-11-30 10:00:35 +09:00
list-objects-filter.c Merge branch 'jk/unused-post-2.39' into maint-2.39 2023-02-14 14:15:55 -08:00
list-objects-filter.h
list-objects.c list-objects: drop process_gitlink() function 2022-12-13 22:16:22 +09:00
list-objects.h
list.h
ll-merge.c attr: add flag `--source` to work with tree-ish 2023-01-14 08:49:55 -08:00
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 Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
log-tree.h
ls-refs.c ls-refs: use repository parameter to iterate refs 2022-12-13 22:16:22 +09:00
ls-refs.h
mailinfo.c mailinfo -b: fix an out of bounds access 2022-10-03 09:05:07 -07:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
mem-pool.c mem_pool: add GIT_TRACE_MEMPOOL support 2023-03-13 18:23:40 +01:00
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c Merge branch 'en/ort-dir-rename-and-symlink-fix' 2022-10-30 21:04:43 -04:00
merge-ort.h
merge-recursive.c Introduce helper to create symlinks that knows about index_state 2023-03-13 18:23:45 +01:00
merge-recursive.h
merge.c use child_process members "args" and "env" directly 2022-10-30 14:04:40 -04:00
mergesort.h
midx.c Merge branch 'tb/midx-bitmap-selection-fix' 2022-10-27 14:51:52 -07:00
midx.h pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests 2022-08-26 10:13:54 -07:00
name-hash.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
notes.h
object-file.c hash algorithms: use size_t for section lengths 2023-03-13 18:23:32 +01:00
object-name.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
object-store.h object-file.c: use size_t for header lengths 2023-03-13 18:23:32 +01:00
object.c blob: drop unused parts of parse_blob_buffer() 2022-12-13 22:16:22 +09:00
object.h parse_object(): allow skipping hash check 2022-09-07 12:18:57 -07:00
oid-array.c
oid-array.h
oidmap.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c pack-bitmap-write.c: instrument number of reused bitmaps 2022-10-13 13:35:08 -07:00
pack-bitmap.c pack-bitmap.c: trace bitmap ignore logs when midx-bitmap is found 2022-11-29 09:54:56 +09:00
pack-bitmap.h pack-bitmap: prepare to read lookup table extension 2022-08-26 10:13:58 -07:00
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c git: remove duplicate includes 2022-12-15 09:09:38 +09:00
pack.h
packfile.c packfile: inline custom read_object() 2023-01-08 10:52:55 +09:00
packfile.h
pager.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
parallel-checkout.c checkout.c: enable fscache for checkout again 2023-03-13 18:23:40 +01:00
parallel-checkout.h
parse-options-cb.c
parse-options.c use DUP_ARRAY 2023-01-09 13:28:36 +09:00
parse-options.h submodule--helper: don't use global --super-prefix in "absorbgitdirs" 2022-12-26 10:21:43 +09:00
patch-delta.c
patch-ids.c Merge branch 'jz/patch-id' 2022-10-30 21:04:41 -04:00
patch-ids.h patch-id: use stable patch-id for rebases 2022-10-24 15:44:19 -07:00
path.c mingw: deprecate old-style runtime-prefix handling in interpolate_path() 2023-03-13 18:23:46 +01:00
path.h
pathspec.c docs & comments: replace mentions of "git-add--interactive.perl" 2023-02-06 15:03:34 -08:00
pathspec.h
pkt-line.c t0021: implementation the rot13-filter.pl script in C 2022-08-14 22:57:12 -07:00
pkt-line.h Merge branch 'mt/rot13-in-c' 2022-08-29 14:55:11 -07:00
preload-index.c fscache: update fscache to be thread specific instead of global 2023-03-13 18:23:40 +01:00
pretty.c Sync with Git 2.37.5 2022-12-13 21:23:36 +09:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c promisor-remote: die upon failing fetch 2022-10-05 11:06:53 -07:00
promisor-remote.h promisor-remote: remove a return value 2022-10-05 11:06:52 -07:00
prompt.c git add -i: handle CR/LF line endings in the interactive input 2023-03-13 18:23:31 +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: avoid compiler warning when char is unsigned 2023-02-28 14:43:05 -08:00
range-diff.h
reachable.c
reachable.h
read-cache.c mingw: special-case index entries for symlinks with buggy size 2023-03-13 18:23:44 +01:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c convert trivial uses of strncmp() to starts_with() 2023-01-08 10:34:35 +09:00
ref-filter.h
reflog-walk.c string-list: mark unused callback parameters 2022-10-17 21:24:04 -07:00
reflog-walk.h
reflog.c Merge branch 'rs/reflog-expiry-cleanup' into maint-2.39 2023-02-14 14:15:56 -08:00
reflog.h
refs.c Merge branch 'jk/shorten-unambiguous-ref-wo-sscanf' 2023-02-27 10:08:57 -08:00
refs.h ls-refs: use repository parameter to iterate refs 2022-12-13 22:16:22 +09:00
refspec.c
refspec.h
remote-curl.c Sync with 2.37.6 2023-02-06 09:43:28 +01:00
remote.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
remote.h clone: request the 'bundle-uri' command when available 2022-12-25 16:24:23 +09:00
replace-object.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
replace-object.h
repo-settings.c Enable the built-in FSMonitor as an experimental feature 2023-03-13 18:23:32 +01:00
repository.c status: fix for old-style submodules with commondir 2023-03-13 18:23:34 +01:00
repository.h features: feature.manyFiles implies fast index writes 2023-01-07 07:46:14 +09:00
rerere.c
rerere.h
reset.c rebase: use 'skip_cache_tree_update' option 2022-11-10 21:49:34 -05:00
reset.h
resolve-undo.c
resolve-undo.h
revision.c treewide: always have a valid "index_state.repo" member 2023-01-17 14:32:06 -08:00
revision.h Merge branch 'ps/receive-use-only-advertised' 2022-11-23 11:22:25 +09:00
run-command.c run-command: allow stdin for run_processes_parallel 2023-02-08 12:50:03 -08:00
run-command.h Merge branch 'rs/no-more-run-command-v' 2022-11-08 17:15:12 -05:00
scalar.c scalar: only warn when background maintenance fails 2023-01-27 12:38:26 -08:00
send-pack.c Config option to disable side-band-64k for transport 2023-03-13 18:23:30 +01:00
send-pack.h
sequencer.c Merge branch 'pw/rebase-i-parse-fix' 2023-02-28 16:38:47 -08:00
sequencer.h sequencer API users: fix get_replay_opts() leaks 2023-02-06 16:03:52 -08:00
serve.c protocol v2: add server-side "bundle-uri" skeleton 2022-12-25 16:24:23 +09:00
serve.h
server-info.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
setup.c setup: properly use "%(prefix)/" when in WSL 2023-03-13 18:23:33 +01:00
sh-i18n--envsubst.c
sha1dc_git.c hash algorithms: use size_t for section lengths 2023-03-13 18:23:32 +01:00
sha1dc_git.h hash algorithms: use size_t for section lengths 2023-03-13 18:23:32 +01:00
shallow.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
shallow.h
shared.mak Merge branch 'ab/gnumake-4.4-fix' 2022-12-01 18:38:07 +09:00
shell.c replace and remove run_command_v_opt() 2022-10-30 14:04:51 -04:00
shortlog.h shortlog: extract `shortlog_finish_setup()` 2022-10-24 14:48:05 -07:00
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c treewide: always have a valid "index_state.repo" member 2023-01-17 14:32:06 -08:00
sparse-index.h
split-index.c treewide: always have a valid "index_state.repo" member 2023-01-17 14:32:06 -08:00
split-index.h
stable-qsort.c
strbuf.c strbuf_readlink: support link targets that exceed PATH_MAX 2023-03-13 18:23:44 +01:00
strbuf.h strbuf: introduce strbuf_strip_file_from_path() 2022-12-25 16:24:24 +09:00
streaming.c streaming: inline call to read_object_file_extended() 2023-01-08 10:52:54 +09:00
streaming.h
string-list.c string-list: mark unused callback parameters 2022-10-17 21:24:04 -07:00
string-list.h string-list: document iterator behavior on NULL input 2022-09-27 09:32:26 -07:00
strmap.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
strmap.h
strvec.c
strvec.h
sub-process.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
sub-process.h
submodule-config.c run-command API: don't fall back on online_cpus() 2022-10-12 14:12:41 -07:00
submodule-config.h
submodule.c Merge branch 'ab/no-more-git-global-super-prefix' 2023-01-05 15:07:23 +09:00
submodule.h read-tree: add "--super-prefix" option, eliminate global 2022-12-26 10:21:44 +09:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c tempfile: update comment describing state transitions 2022-08-30 14:16:51 -07:00
tempfile.h tempfile: drop active flag 2022-08-30 14:16:49 -07:00
thread-utils.c
thread-utils.h
tmp-objdir.c tmp-objdir: skip clean up when handling a signal 2022-09-30 21:26:58 -07:00
tmp-objdir.h replace and remove run_command_v_opt_cd_env() 2022-10-30 14:04:47 -04:00
trace.c trace.c, git.c: remove unnecessary parameter to trace_repo_setup() 2023-02-21 12:06:32 -08:00
trace.h trace.c, git.c: remove unnecessary parameter to trace_repo_setup() 2023-02-21 12:06:32 -08:00
trace2.c trace2: add global counter mechanism 2022-10-24 12:45:26 -07:00
trace2.h trace2: add global counter mechanism 2022-10-24 12:45:26 -07:00
trailer.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
trailer.h
transport-helper.c Always auto-gc after calling a fast-import transport 2023-03-13 18:23:29 +01:00
transport-internal.h clone: request the 'bundle-uri' command when available 2022-12-25 16:24:23 +09:00
transport.c Merge branch 'ds/bundle-uri-4' 2023-01-02 21:37:18 +09:00
transport.h clone: request the 'bundle-uri' command when available 2022-12-25 16:24:23 +09:00
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: enable fscache for sparse-checkout 2023-03-13 18:23:40 +01:00
unpack-trees.h read-tree: add "--super-prefix" option, eliminate global 2022-12-26 10:21:44 +09:00
upload-pack.c refs: get rid of global list of hidden refs 2022-11-17 16:22:51 -05:00
upload-pack.h
url.c
url.h
urlmatch.c convert trivial uses of strncmp() to starts_with() 2023-01-08 10:34:35 +09:00
urlmatch.h
usage.c
userdiff.c Merge branch 'jc/diff-algo-attribute' 2023-02-27 10:08:56 -08:00
userdiff.h diff: teach diff to read algorithm from diff driver 2023-02-21 09:29:10 -08:00
utf8.c Sync with Git 2.31.6 2022-12-13 21:09:40 +09:00
utf8.h Sync with Git 2.31.6 2022-12-13 21:09:40 +09:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
worktree.h refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
wrap-for-bin.sh
wrapper.c Merge branch 'jk/pipe-command-nonblock' 2022-08-25 14:42:32 -07:00
write-or-die.c environ: GIT_FLUSH should be made a usual Boolean 2022-09-15 11:34:51 -07:00
ws.c Merge branch 'kn/attr-from-tree' 2023-01-23 13:39:51 -08:00
wt-status.c commit: accept "scissors" with CR/LF line endings 2023-03-13 18:23:31 +01:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

Git for Windows

Open in Visual Studio Code Build status Join the chat at https://gitter.im/git-for-windows/git

This is Git for Windows, the Windows port of Git.

The Git for Windows project is run using a governance model. If you encounter problems, you can report them as GitHub issues, discuss them on Git for Windows' Google Group, and contribute bug fixes.

To build Git for Windows, please either install Git for Windows' SDK, start its git-bash.exe, cd to your Git worktree and run make, or open the Git worktree as a folder in Visual Studio.

To verify that your build works, use one of the following methods:

  • If you want to test the built executables within Git for Windows' SDK, prepend <worktree>/bin-wrappers to the PATH.

  • Alternatively, run make install in the Git worktree.

  • If you need to test this in a full installer, run sdk build git-and-installer.

  • You can also "install" Git into an existing portable Git via make install DESTDIR=<dir> where <dir> refers to the top-level directory of the portable Git. In this instance, you will want to prepend that portable Git's /cmd directory to the PATH, or test by running that portable Git's git-bash.exe or git-cmd.exe.

  • If you built using a recent Visual Studio, you can use the menu item Build>Install git (you will want to click on Project>CMake Settings for Git first, then click on Edit JSON and then point installRoot to the mingw64 directory of an already-unpacked portable Git).

    As in the previous bullet point, you will then prepend /cmd to the PATH or run using the portable Git's git-bash.exe or git-cmd.exe.

  • If you want to run the built executables in-place, but in a CMD instead of inside a Bash, you can run a snippet like this in the git-bash.exe window where Git was built (ensure that the EOF line has no leading spaces), and then paste into the CMD window what was put in the clipboard:

    clip.exe <<EOF
    set GIT_EXEC_PATH=$(cygpath -aw .)
    set PATH=$(cygpath -awp ".:contrib/scalar:/mingw64/bin:/usr/bin:$PATH")
    set GIT_TEMPLATE_DIR=$(cygpath -aw templates/blt)
    set GITPERLLIB=$(cygpath -aw perl/build/lib)
    EOF
    
  • If you want to run the built executables in-place, but outside of Git for Windows' SDK, and without an option to set/override any environment variables (e.g. in Visual Studio's debugger), you can call the Git executable by its absolute path and use the --exec-path option, like so:

    C:\git-sdk-64\usr\src\git\git.exe --exec-path=C:\git-sdk-64\usr\src\git help
    

    Note: for this to work, you have to hard-link (or copy) the .dll files from the /mingw64/bin directory to the Git worktree, or add the /mingw64/bin directory to the PATH somehow or other.

To make sure that you are testing the correct binary, call ./git.exe version in the Git worktree, and then call git version in a directory/window where you want to test Git, and verify that they refer to the same version (you may even want to pass the command-line option --build-options to look at the exact commit from which the Git version was built).

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of core Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). The mailing list archives are available at https://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites. The core git mailing list is plain text (no HTML!).

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks