A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Johannes Schindelin 1ec91ae74d mark_fsmonitor_valid(): mark the index as changed if needed
Without this bug fix, t7519's four "status doesn't detect unreported
modifications" test cases would fail occasionally (and, oddly enough,
*a lot* more frequently on Windows).

The reason is that these test cases intentionally use the side effect of
`git status` to re-write the index if any updates were detected: they
first clean the worktree, run `git status` to update the index as well
as show the output to the casual reader, then make the worktree dirty
again and expect no changes to reported if running with a mocked
fsmonitor hook.

The problem with this strategy was that the index was written during
said `git status` on the clean worktree for the *wrong* reason: not
because the index was marked as changed (it wasn't), but because the
recorded mtimes were racy with the index' own mtime.

As the mtime granularity on Windows is 100 nanoseconds (see e.g.
https://docs.microsoft.com/en-us/windows/desktop/SysInfo/file-times),
the mtimes of the files are often enough *not* racy with the index', so
that that `git status` call currently does not always update the index
(including the fsmonitor extension), causing the test case to fail.

The obvious fix: if we change *any* index entry's `CE_FSMONITOR_VALID`
flag, we should also mark the index as changed. That will cause the
index to be written upon `git status`, *including* an updated fsmonitor
extension.

Side note: Even though the reader might think that the t7519 issue
should be *much* more prevalent on Linux, given that the ext4 filesystem
(that seems to be used by every Linux distribution) stores mtimes in
nanosecond precision. However, ext4 uses `current_kernel_time()` (see
https://unix.stackexchange.com/questions/11599#comment762968_11599; it
is *amazingly* hard to find any proper source of information about such
ext4 questions) whose accuracy seems to depend on many factors but is
safely worse than the 100-nanosecond granularity of NTFS (again, it is
*horribly* hard to find anything remotely authoritative about this
question). So it seems that the racy index condition that hid the bug
fixed by this patch simply is a lot more likely on Linux than on
Windows. But not impossible ;-)

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2019-06-07 23:14:03 +02:00
.github .github: Add configuration for the Sentiment Bot 2019-06-03 23:04:51 +02:00
Documentation Merge 'readme' into HEAD 2019-06-03 23:04:59 +02:00
block-sha1
builtin fill_stat_cache_info(): prepare for an fsmonitor fix 2019-06-07 23:14:03 +02:00
ci Merge pull request #2148 from dscho/azure-pipelines-msvc 2019-06-03 22:59:36 +02:00
compat Merge pull request #1170 from dscho/mingw-kill-process 2019-06-03 23:04:58 +02:00
contrib vcxproj: also link-or-copy builtins 2019-06-03 22:59:28 +02:00
ewah
git-gui Merge branch 'git-gui-askyesno' 2019-06-03 22:59:44 +02:00
gitk-git Merge branch 'gitk-and-git-gui-patches' 2019-06-03 23:04:52 +02:00
gitweb
mergetools
negotiator
perl
po Merge branch 'fr_review' of git://github.com/jnavila/git 2019-06-07 16:51:09 +08:00
ppc
refs Introduce helper to create symlinks that knows about index_state 2019-06-03 23:04:46 +02:00
sha1collisiondetection@855827c583
sha1dc
sha256
t Merge branch 'en/merge-directory-renames-fix' 2019-06-06 14:03:36 -07:00
templates
trace2 Merge branch 'sg/trace2-rename' 2019-05-30 10:50:45 -07:00
vcs-svn
xdiff
.clang-format
.editorconfig
.gitattributes gitattributes: mark .png files as binary 2019-06-03 23:04:47 +02:00
.gitignore Merge 'drop-rebase--am.sh' 2019-06-03 22:59:40 +02:00
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
COPYING
GIT-VERSION-GEN Git 2.22 2019-06-07 09:39:21 -07:00
INSTALL
LGPL-2.1
Makefile test-tool: learn to act as a drop-in replacement for `iconv` 2019-06-03 23:04:47 +02:00
README.md README.md: Add a Windows-specific preamble 2019-06-03 23:04:51 +02:00
RelNotes
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c fill_stat_cache_info(): prepare for an fsmonitor fix 2019-06-07 23:14:03 +02:00
apply.h
archive-tar.c archive: avoid spawning `gzip` 2019-06-03 22:59:19 +02:00
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
azure-pipelines.yml ci: also test with MS Visual C on Azure Pipelines 2019-06-03 22:59:29 +02:00
banned.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c cache-tree.c: avoid reusing the DEBUG constant 2019-06-03 22:59:25 +02:00
cache-tree.h
cache.h fill_stat_cache_info(): prepare for an fsmonitor fix 2019-06-07 23:14:03 +02:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check_bindir
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c commit-graph: use raw_object_store when closing 2019-06-03 22:59:31 +02:00
commit-graph.h commit-graph: use raw_object_store when closing 2019-06-03 22:59:31 +02:00
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c
commit.h stash -p: respect the add.interactive.usebuiltin setting 2019-06-03 22:59:22 +02:00
common-main.c
config.c Windows: add support for a Windows-wide configuration 2019-06-03 22:59:29 +02:00
config.h
config.mak.dev
config.mak.in
config.mak.uname mingw: add a Makefile target to copy test artifacts 2019-06-03 23:04:49 +02:00
configure.ac
connect.c mingw: support UNC in git clone file://server/share/repo 2019-06-03 22:59:18 +02:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c mingw: ensure that core.longPaths is handled *always* 2019-06-03 23:04:43 +02:00
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c mark_fsmonitor_valid(): mark the index as changed if needed 2019-06-07 23:14:03 +02:00
diff-no-index.c
diff.c Merge branch 'munmap-before-ext-diff' 2019-06-03 22:59:37 +02:00
diff.h diff: export diffstat interface 2019-06-03 22:59:19 +02:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename: speed up register_rename_src 2019-06-03 22:59:18 +02:00
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c dir.c: regression fix for add_excludes with fscache 2019-06-03 23:04:41 +02:00
dir.h
editor.c
entry.c fill_stat_cache_info(): prepare for an fsmonitor fix 2019-06-07 23:14:03 +02:00
environment.c
exec-cmd.c
exec-cmd.h
fast-import.c
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c fscache: fscache takes an initial size 2019-06-03 23:04:42 +02:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor.c
fsmonitor.h mark_fsmonitor_valid(): mark the index as changed if needed 2019-06-07 23:14:03 +02:00
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c gettext: always use UTF-8 on native Windows 2019-06-03 22:59:30 +02:00
gettext.h
git-add--interactive.perl Allow `add -p` and `add -i` with a large number of files 2019-06-03 23:04:39 +02:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Introduce helper to create symlinks that knows about index_state 2019-06-03 23:04:46 +02:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-stash.sh stash -p: (partially) fix bug concerning split hunks 2019-06-03 22:59:24 +02:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh Drop unused git-rebase--am.sh 2019-06-03 22:59:32 +02:00
git-rebase--common.sh rebase: fold git-rebase--common into the -p backend 2019-06-03 22:59:32 +02:00
git-rebase--preserve-merges.sh rebase: fold git-rebase--common into the -p backend 2019-06-03 22:59:32 +02:00
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 2019-06-03 23:04:48 +02:00
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c git: avoid calling aliased builtins via their dashed form 2019-06-03 22:59:28 +02:00
git.rc mingw: Embed a manifest to trick UAC into Doing The Right Thing 2019-06-03 22:59:29 +02:00
gpg-interface.c Unbreak interactive GPG prompt upon signing 2019-06-03 23:04:43 +02:00
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c mingw: ensure that core.longPaths is handled *always* 2019-06-03 23:04:43 +02:00
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c kwset: allow building with GCC 8 2019-06-03 22:59:31 +02:00
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: disable 'sparse:path' filters 2019-05-29 11:05:34 -07:00
list-objects-filter-options.h list-objects-filter: disable 'sparse:path' filters 2019-05-29 11:05:34 -07:00
list-objects-filter.c list-objects-filter: disable 'sparse:path' filters 2019-05-29 11:05:34 -07:00
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 2019-06-03 23:04:44 +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 2019-06-03 23:04:42 +02:00
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'en/merge-directory-renames-fix' 2019-06-06 14:03:36 -07:00
merge-recursive.h
merge.c
mergesort.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-store.h sha1-file: split OBJECT_INFO_FOR_PREFETCH 2019-06-03 22:59:32 +02:00
object.c packfile: close_all_packs to close_object_store 2019-06-03 22:59:31 +02:00
object.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c packfile: close_all_packs to close_object_store 2019-06-03 22:59:31 +02:00
packfile.h packfile: close_all_packs to close_object_store 2019-06-03 22:59:31 +02:00
pager.c
parse-options-cb.c Merge branch 'nd/diff-parseopt' 2019-05-30 10:50:44 -07:00
parse-options.c Merge branch 'nd/diff-parseopt' 2019-05-30 10:50:44 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c mingw: handle absolute paths in expand_user_path() 2019-06-03 22:59:18 +02:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c mark_fsmonitor_valid(): mark the index as changed if needed 2019-06-07 23:14:03 +02:00
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c Merge branch 'sg/progress-off-by-one-fix' 2019-05-30 10:50:45 -07:00
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache.c mark_fsmonitor_valid(): mark the index as changed if needed 2019-06-07 23:14:03 +02:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c mingw: ensure that core.longPaths is handled *always* 2019-06-03 23:04:43 +02:00
refs.h
refspec.c
refspec.h
remote-curl.c i18n: fix typos found during l10n for git 2.22.0 2019-06-03 11:10:53 -07:00
remote-testsvn.c
remote.c
remote.h
replace-object.c
replace-object.h
repository.c built-in add -i: refresh the index before running `status` 2019-06-03 22:59:19 +02:00
repository.h built-in add -i: refresh the index before running `status` 2019-06-03 22:59:19 +02:00
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'always-reword-merge-c' 2019-06-03 22:59:41 +02:00
sequencer.h
serve.c
serve.h
server-info.c
setup.c setup_git_directory(): handle UNC root paths correctly 2019-06-03 22:59:18 +02:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c sha1-file: split OBJECT_INFO_FOR_PREFETCH 2019-06-03 22:59:32 +02:00
sha1-lookup.c msvc: avoid using minus operator on unsigned types 2019-06-03 22:59:28 +02:00
sha1-lookup.h
sha1-name.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c strbuf_readlink: support link targets that exceed PATH_MAX 2019-06-03 23:04:44 +02:00
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.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 trace2: rename environment variables to GIT_TRACE2* 2019-05-28 10:20:34 -07:00
trailer.c
trailer.h
transport-helper.c transport-helper: prefer Git's builtins over dashed form 2019-06-03 23:04:46 +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
unpack-trees.c
unpack-trees.h
upload-pack.c commit-graph: use raw_object_store when closing 2019-06-03 22:59:31 +02:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
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.c
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

Build Status

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-.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 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). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are available at https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

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