A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Kevin Willford 45b5d1446e fsmonitor: add script for debugging and update script for tests
The fsmonitor script that can be used for running all the git tests
using watchman was causing some of the tests to fail because it wrote
to stderr and created some files for debugging purposes.

Add a new debug script to use with debugging and modify the other script
to remove the code that would cause tests to fail.

Signed-off-by: Kevin Willford <Kevin.Willford@microsoft.com>
2023-04-25 13:17:53 -04:00
.github Merge 'readme' into HEAD 2023-04-18 20:43:53 +02:00
Documentation status: deserialization wait 2023-04-25 13:17:53 -04:00
block-sha1
builtin status: deserialization wait 2023-04-25 13:17:53 -04:00
ci Merge branch 'ci-fixes' 2023-04-18 20:43:11 +02:00
compat Merge pull request #3492 from dscho/ns/batched-fsync 2023-04-18 20:43:51 +02:00
contrib status: add status serialization mechanism 2023-04-25 13:17:53 -04:00
ewah
git-gui Merge branch 'git-gui-askyesno' 2023-04-18 20:43:24 +02:00
gitk-git gitk: make the "list references" default window width wider 2023-04-18 20:43:23 +02:00
gitweb
mergetools
negotiator
oss-fuzz
perl
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-04-18 20:43:37 +02:00
reftable
sha1collisiondetection@855827c583
sha1dc
sha256
t fsmonitor: add script for debugging and update script for tests 2023-04-25 13:17:53 -04:00
templates
trace2
xdiff
.cirrus.yml
.clang-format
.editorconfig
.gitattributes gitattributes: mark .png files as binary 2023-04-18 20:43:38 +02:00
.gitignore .gitignore: add Visual Studio CMakeSetting.json file 2023-04-18 12:52:21 +02:00
.gitmodules
.mailmap
.tsan-suppressions
ARCHITECTURE.md Describe Git for Windows' architecture [no ci] 2023-04-18 20:43:44 +02:00
BRANCHES.md BRANCHES.md: Add explanation of branches and using forks 2023-04-25 13:17:53 -04:00
CODE_OF_CONDUCT.md Modify the Code of Conduct for Git for Windows 2023-04-18 20:43:44 +02:00
CONTRIBUTING.md CONTRIBUTING.md: add guide for first-time contributors 2023-04-18 20:43:44 +02:00
COPYING
GIT-VERSION-GEN gvfs: ensure that the version is based on a GVFS tag 2023-04-25 13:17:52 -04:00
INSTALL Sync with 2.31.8 2023-04-17 21:15:49 +02:00
LGPL-2.1
Makefile status: add status serialization mechanism 2023-04-25 13:17:53 -04:00
README.md README.md: Add a Windows-specific preamble 2023-04-18 20:43:44 +02:00
RelNotes Git 2.40.1 2023-04-17 21:16:10 +02:00
SECURITY.md SECURITY.md: document Git for Windows' policies 2023-04-18 20:43:45 +02:00
abspath.c strbuf_realpath(): use platform-dependent API if available 2023-04-18 12:52:12 +02:00
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c Merge branch 'deprecate-core.useBuiltinFSMonitor' 2023-04-18 20:43:53 +02:00
advice.h Merge branch 'deprecate-core.useBuiltinFSMonitor' 2023-04-18 20:43:53 +02:00
alias.c
alias.h
alloc.c
alloc.h
apply.c sparse-checkout: avoid writing entries with the skip-worktree bit 2023-04-25 13:17:53 -04:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'rs/archive-mtime' 2023-02-27 10:08:57 -08:00
archive.h
attr.c
attr.h
azure-pipelines.yml azure-pipeline: run static-analysis on jammy 2023-04-18 12:52:27 +02:00
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
bulk-checkin.c
bulk-checkin.h
bundle-uri.c
bundle-uri.h
bundle.c
bundle.h
cache-tree.c cache-tree: remove use of strbuf_addf in update_one 2023-04-25 13:17:53 -04:00
cache-tree.h
cache.h fsmonitor: check CE_FSMONITOR_VALID in ce_uptodate 2023-04-25 13:17:53 -04:00
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c
chunk-format.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c gvfs: add the feature that blobs may be missing 2023-04-25 13:17:53 -04:00
commit.h
common-main.c
config.c virtualfilesystem: don't run the virtual file system hook if the index has been redirected 2023-04-25 13:17:53 -04:00
config.h Add virtual file system settings and hook proc 2023-04-25 13:17:53 -04:00
config.mak.dev mimalloc: offer a build-time option to enable it 2023-04-18 12:52:10 +02:00
config.mak.in
config.mak.uname mingw: add a Makefile target to copy test artifacts 2023-04-18 20:43:41 +02:00
configure.ac
connect.c
connect.h
connected.c gvfs: allow "virtualizing" objects 2023-04-25 13:17:53 -04:00
connected.h
convert.c gvfs: ensure all filters and EOL conversions are blocked 2023-04-25 13:17:53 -04:00
convert.h
copy.c
credential.c
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
diagnose.h
diff-delta.c
diff-lib.c
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c Merge branch 'jc/diff-algo-attribute' 2023-02-27 10:08:56 -08: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-rename.c
diffcore-rotate.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Add virtual file system settings and hook proc 2023-04-25 13:17:53 -04:00
dir.h
editor.c Partially un-revert "editor: save and reset terminal after calling EDITOR" 2023-04-18 20:43:42 +02:00
entry.c Introduce helper to create symlinks that knows about index_state 2023-04-18 20:43:37 +02:00
entry.h
environment.c Add virtual file system settings and hook proc 2023-04-25 13:17:53 -04:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c fscache: fscache takes an initial size 2023-04-18 20:43:19 +02:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor--daemon.h
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-path-utils.h
fsmonitor-settings.c fsmonitor: reintroduce core.useBuiltinFSMonitor 2023-04-18 20:43:43 +02:00
fsmonitor-settings.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c Sync with 2.38.5 2023-04-17 21:16:08 +02:00
gettext.h Sync with 2.33.8 2023-04-17 21:15:56 +02:00
git-archimport.perl
git-compat-util.h Introduce helper to create symlinks that knows about index_state 2023-04-18 20:43:37 +02:00
git-curl-compat.h http: optionally send SSL client certificate 2023-04-18 12:52:20 +02: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 2023-04-18 20:43:40 +02:00
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c worktree: allow in Scalar repositories 2023-04-25 13:17:53 -04:00
git.rc Fix Windows version resources 2023-04-18 12:52:28 +02:00
gpg-interface.c Unbreak interactive GPG prompt upon signing 2023-04-18 20:43:32 +02:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
gvfs.c gvfs: allow overriding core.gvfs 2023-04-25 13:17:53 -04:00
gvfs.h worktree: allow in Scalar repositories 2023-04-25 13:17:53 -04:00
hash-lookup.c
hash-lookup.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
hook.c backwards-compatibility: support the post-indexchanged hook 2023-04-25 13:17:53 -04:00
hook.h
http-backend.c
http-fetch.c
http-push.c Sync with 2.31.8 2023-04-17 21:15:49 +02:00
http-walker.c
http.c http: optionally send SSL client certificate 2023-04-18 12:52:20 +02:00
http.h Sync with 2.30.9 2023-04-17 21:15:44 +02:00
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 2023-04-18 20:43:33 +02: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 2023-04-18 20:43:19 +02:00
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c
merge-ort.h
merge-recursive.c merge-recursive: teach was_dirty() about the virtualfilesystem 2023-04-25 13:17:53 -04:00
merge-recursive.h
merge.c
mergesort.h
midx.c
midx.h
name-hash.c
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: when writing objects, skip the read_object_hook 2023-04-25 13:17:53 -04:00
object-name.c
object-store.h object-file.c: use size_t for header lengths 2023-04-18 12:52:23 +02:00
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c
packfile.h
pager.c
parallel-checkout.c checkout.c: enable fscache for checkout again 2023-04-18 20:43:18 +02:00
parallel-checkout.h
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c mingw: deprecate old-style runtime-prefix handling in interpolate_path() 2023-04-18 20:43:43 +02:00
path.h
pathspec.c
pathspec.h
pkt-line.c status: add status serialization mechanism 2023-04-25 13:17:53 -04:00
pkt-line.h status: add status serialization mechanism 2023-04-25 13:17:53 -04:00
preload-index.c fscache: update fscache to be thread specific instead of global 2023-04-18 20:43:19 +02:00
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c
promisor-remote.h
prompt.c git add -i: handle CR/LF line endings in the interactive input 2023-04-18 12:52:14 +02: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 Sync with 2.31.8 2023-04-17 21:15:49 +02:00
range-diff.h
reachable.c
reachable.h
read-cache.c Add virtual file system settings and hook proc 2023-04-25 13:17:53 -04:00
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c Merge branch 'jk/shorten-unambiguous-ref-wo-sscanf' 2023-02-27 10:08:57 -08:00
refs.h
refspec.c
refspec.h
remote-curl.c Sync with 2.32.7 2023-04-17 21:15:52 +02:00
remote.c
remote.h
replace-object.c
replace-object.h
repo-settings.c gvfs: add the feature to skip writing the index' SHA-1 2023-04-25 13:17:52 -04:00
repository.c status: fix for old-style submodules with commondir 2023-04-18 12:52:28 +02:00
repository.h
rerere.c
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c
run-command.h
scalar.c
send-pack.c send-pack: do not check for sha1 file when GVFS_MISSING_OK set 2023-04-25 13:17:53 -04:00
send-pack.h
sequencer.c Merge branch 'pw/rebase-i-parse-fix' 2023-02-28 16:38:47 -08:00
sequencer.h
serve.c
serve.h
server-info.c
setup.c setup: properly use "%(prefix)/" when in WSL 2023-04-18 12:52:24 +02:00
sh-i18n--envsubst.c
sha1dc_git.c hash algorithms: use size_t for section lengths 2023-04-18 12:52:23 +02:00
sha1dc_git.h hash algorithms: use size_t for section lengths 2023-04-18 12:52:23 +02:00
shallow.c
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Add virtual file system settings and hook proc 2023-04-25 13:17:53 -04:00
sparse-index.h
split-index.c
split-index.h
stable-qsort.c
strbuf.c strbuf_readlink: support link targets that exceed PATH_MAX 2023-04-18 20:43:33 +02: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.h
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 2023-04-18 12:52:07 +02: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 Add virtual file system settings and hook proc 2023-04-25 13:17:53 -04:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c Merge branch 'jc/diff-algo-attribute' 2023-02-27 10:08:56 -08:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
virtualfilesystem.c vfs: fix case where directories not handled correctly 2023-04-25 13:17:53 -04:00
virtualfilesystem.h Add virtual file system settings and hook proc 2023-04-25 13:17:53 -04:00
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status-deserialize.c wt-status-deserialize: fix crash when -v is used 2023-04-25 13:17:53 -04:00
wt-status-serialize.c serialize-status: serialize global and repo-local exclude file metadata 2023-04-25 13:17:53 -04:00
wt-status.c status: serialize to path 2023-04-25 13:17:53 -04:00
wt-status.h status: deserialization wait 2023-04-25 13:17:53 -04:00
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