mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 20:36:19 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
52,806 Commits 6 Branches 947 Tags 338 MiB
C 50%
Shell 38.7%
Perl 5.3%
Tcl 3.4%
Python 0.8%
Other 1.6%
Go to file
SZEDER Gábor e3d837989e split-index: don't compare cached data of entries already marked for split index 
When unpack_trees() constructs a new index, it copies cache entries
from the original index [1].  prepare_to_write_split_index() has to
deal with this, and it has a dedicated code path for copied entries
that are present in the shared index, where it compares the cached
data in the corresponding copied and original entries.  If the cached
data matches, then they are considered the same; if it differs, then
the copied entry will be marked for inclusion as a replacement entry
in the just about to be written split index by setting the
CE_UPDATE_IN_BASE flag.

However, a cache entry already has its CE_UPDATE_IN_BASE flag set upon
reading the split index, if the entry already has a replacement entry
there, or upon refreshing the cached stat data, if the corresponding
file was modified.  The state of this flag is then preserved when
unpack_trees() copies a cache entry from the shared index.

So modify prepare_to_write_split_index() to check the copied cache
entries' CE_UPDATE_IN_BASE flag first, and skip the thorough
comparison of cached data if the flag is already set.  Those couple of
lines comparing the cached data would then have too many levels of
indentation, so extract them into a helper function.

Note that comparing the cached data in copied and original entries in
the shared index might actually be entirely unnecessary.  In theory
all code paths refreshing the cached stat data of an entry in the
shared index should set the CE_UPDATE_IN_BASE flag in that entry, and
unpack_trees() should preserve this flag when copying cache entries.
This means that the cached data is only ever changed if the
CE_UPDATE_IN_BASE flag is set as well.  Our test suite seems to
confirm this: instrumenting the conditions in question and running the
test suite repeatedly with 'GIT_TEST_SPLIT_INDEX=yes' showed that the
cached data in a copied entry differs from the data in the shared
entry only if its CE_UPDATE_IN_BASE flag is indeed set.

In practice, however, our test suite doesn't have 100% coverage,
GIT_TEST_SPLIT_INDEX is inherently random, and I certainly can't claim
to possess complete understanding of what goes on in unpack_trees()...
Therefore I kept the comparison of the cached data when
CE_UPDATE_IN_BASE is not set, just in case that an unnoticed or future
code path were to accidentally miss setting this flag upon refreshing
the cached stat data or unpack_trees() were to drop this flag while
copying a cache entry.

[1] Note that when unpack_trees() constructs the new index and decides
    that a cache entry should now refer to different content than what
    was recorded in the original index (e.g. 'git read-tree -m
    HEAD^'), then that can't really be considered a copy of the
    original, but rather the creation of a new entry.  Notably and
    pertinent to the split index feature, such a new entry doesn't
    have a reference to the original's shared index entry anymore,
    i.e. its 'index' field is set to 0.  Consequently, such an entry
    is treated by prepare_to_write_split_index() as an entry not
    present in the shared index and it will be added to the new split
    index, while the original entry will be marked as deleted, and
    neither the above discussion nor the changes in this patch apply
    to them.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 		2018-10-12 07:23:29 +09:00
.github
…
Documentation Git 2.19 2018-09-10 10:41:56 -07:00
block-sha1
…
builtin Revert "Merge branch 'sb/submodule-core-worktree'" 2018-09-07 19:05:20 -07:00
ci Merge branch 'nd/pack-deltify-regression-fix' 2018-08-22 11:17:05 -07:00
compat Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
contrib Merge branch 'js/range-diff' 2018-08-20 11:33:53 -07:00
ewah ewah: delete unused 'rlwit_discharge_empty()' 2018-06-21 09:39:48 -07:00
git-gui
…
gitk-git
…
gitweb
…
mergetools
…
negotiator Merge branch 'jt/fetch-negotiator-skipping' 2018-08-02 15:30:46 -07:00
perl
…
po l10n: zh_CN: for git v2.19.0 l10n round 1 to 2 2018-09-09 22:38:39 +08:00
ppc
…
refs Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
sha1collisiondetection@232357eb2e sha1dc: update from upstream 2018-08-02 13:54:58 -07:00
sha1dc sha1dc: update from upstream 2018-08-02 13:54:58 -07:00
t t1700-split-index: date back files to avoid racy situations 2018-10-12 07:23:29 +09:00
templates
…
vcs-svn
…
xdiff Merge branch 'sb/indent-heuristic-optim' 2018-08-17 13:09:57 -07:00
.clang-format
…
.gitattributes
…
.gitignore Merge branch 'js/range-diff' 2018-08-20 11:33:53 -07:00
.gitmodules
…
.mailmap .mailmap: merge different spellings of names 2018-06-29 09:29:44 -07:00
.travis.yml travis-ci: run gcc-8 on linux-gcc jobs 2018-05-21 14:14:09 +09:00
.tsan-suppressions
…
COPYING
…
GIT-VERSION-GEN Git 2.19 2018-09-10 10:41:56 -07:00
INSTALL
…
LGPL-2.1
…
Makefile generate-cmdlist.sh: collect config from all config.txt files 2018-08-21 11:28:11 -07:00
README.md note git-security@googlegroups.com in more places 2018-06-01 09:24:11 +09:00
RelNotes Prepare to start 2.19 cycle 2018-06-25 13:22:27 -07:00
abspath.c
…
aclocal.m4
…
advice.c Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
advice.h Merge branch 'ab/checkout-default-remote' 2018-08-02 15:30:41 -07:00
alias.c completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alias.h completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alloc.c alloc: make allocate_alloc_state and clear_alloc_state more consistent 2018-08-15 11:52:09 -07:00
alloc.h alloc: make allocate_alloc_state and clear_alloc_state more consistent 2018-08-15 11:52:09 -07:00
apply.c apply.c: remove implicit dependency on the_index 2018-08-13 14:14:44 -07:00
apply.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
archive-tar.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
archive-zip.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
archive.c archive.c: avoid access to the_index 2018-08-13 14:14:43 -07:00
archive.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
argv-array.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
argv-array.h Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
attr.c attr: remove index from git_attr_set_direction() 2018-08-13 14:14:43 -07:00
attr.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
banned.h banned.h: mark strncpy() as banned 2018-07-26 10:12:51 -07:00
base85.c
…
bisect.c commit: add repository argument to lookup_commit_reference 2018-06-29 10:43:39 -07:00
bisect.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
blame.c Merge branch 'ab/unconditional-free-and-null' 2018-08-27 14:33:42 -07:00
blame.h blame.c: remove implicit dependency on the_index 2018-08-13 14:14:44 -07:00
blob.c blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
blob.h blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
branch.c Merge branch 'ab/unconditional-free-and-null' 2018-08-27 14:33:42 -07:00
branch.h Move definition of enum branch_track from cache.h to branch.h 2018-08-15 11:52:09 -07:00
builtin.h Introduce `range-diff` to compare iterations of a topic branch 2018-08-13 10:44:50 -07:00
bulk-checkin.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bulk-checkin.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
bundle.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
bundle.h
…
cache-tree.c cache-tree: wrap the_index based wrappers with #ifdef 2018-08-13 14:14:42 -07:00
cache-tree.h cache-tree: wrap the_index based wrappers with #ifdef 2018-08-13 14:14:42 -07:00
cache.h hashcmp: assert constant hash size 2018-08-23 06:20:58 -07:00
chdir-notify.c
…
chdir-notify.h
…
check-builtins.sh
…
check-racy.c
…
check_bindir
…
checkout.c checkout & worktree: introduce checkout.defaultRemote 2018-06-11 09:41:02 -07:00
checkout.h checkout: pass the "num_matches" up to callers 2018-06-11 09:41:01 -07:00
color.c color: protect against out-of-bounds reads and writes 2018-08-03 08:52:05 -07:00
color.h range-diff: use dim/bold cues to improve dual color mode 2018-08-13 10:44:52 -07:00
column.c
…
column.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
combine-diff.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
command-list.txt Introduce `range-diff` to compare iterations of a topic branch 2018-08-13 10:44:50 -07:00
commit-graph.c Merge branch 'jk/for-each-object-iteration' 2018-08-20 11:33:52 -07:00
commit-graph.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
commit-slab-decl.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit-slab-impl.h commit-slabs: remove realloc counter outside of slab struct 2018-06-29 10:43:40 -07:00
commit-slab.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit.c Merge branch 'ds/commit-graph-lockfile-fix' 2018-09-04 14:31:39 -07:00
commit.h Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
common-main.c
…
config.c i18n: fix mistakes in translated strings 2018-08-23 14:29:12 -07:00
config.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
config.mak.dev Makefile: add a DEVOPTS flag to get pedantic compilation 2018-07-25 09:52:32 -07:00
config.mak.in
…
config.mak.uname Merge branch 'es/freebsd-iconv-portability' 2018-09-04 14:31:39 -07:00
configure.ac
…
connect.c connect.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
connect.h fixup! connect.h: avoid forward declaration of an enum 2018-07-09 14:35:39 -07:00
connected.c fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
connected.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
convert.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
convert.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
copy.c
…
credential-cache--daemon.c
…
credential-cache.c
…
credential-store.c
…
credential.c
…
credential.h
…
csum-file.c
…
csum-file.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
ctype.c
…
daemon.c
…
date.c
…
decorate.c
…
decorate.h
…
delta.h
…
detect-compiler
…
diff-delta.c
…
diff-lib.c dir.c: remove an implicit dependency on the_index in pathspec code 2018-08-13 14:14:42 -07:00
diff-no-index.c
…
diff.c Merge branch 'js/range-diff' 2018-08-20 11:33:53 -07:00
diff.h Merge branch 'js/range-diff' 2018-08-20 11:33:53 -07:00
diffcore-break.c
…
diffcore-delta.c
…
diffcore-order.c
…
diffcore-pickaxe.c regex: do not call `regfree()` if compilation fails 2018-05-21 13:58:32 +09:00
diffcore-rename.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
diffcore.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
dir-iterator.c
…
dir-iterator.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
dir.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
dir.h dir.c: remove an implicit dependency on the_index in pathspec code 2018-08-13 14:14:42 -07:00
editor.c
…
entry.c entry.c: use the right index instead of the_index 2018-08-13 14:14:43 -07:00
environment.c Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
exec-cmd.c exec-cmd.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
exec-cmd.h
…
fast-import.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
fetch-negotiator.c negotiator: unknown fetch.negotiationAlgorithm should error out 2018-08-01 11:07:47 -07:00
fetch-negotiator.h negotiator/skipping: skip commits during fetch 2018-07-16 14:51:12 -07:00
fetch-object.c fetch-pack: unify ref in and out param 2018-08-01 15:00:52 -07:00
fetch-object.h
…
fetch-pack.c Merge branch 'ab/fsck-transfer-updates' 2018-08-17 13:09:54 -07:00
fetch-pack.h Merge branch 'jt/fetch-nego-tip' 2018-08-02 15:30:43 -07:00
fmt-merge-msg.h
…
fsck.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
fsck.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
fsmonitor.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
fsmonitor.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
generate-cmdlist.sh generate-cmdlist.sh: collect config from all config.txt files 2018-08-21 11:28:11 -07:00
gettext.c
…
gettext.h
…
git-add--interactive.perl Merge branch 'pw/add-p-recount' 2018-06-28 12:53:32 -07:00
git-archimport.perl
…
git-bisect.sh
…
git-compat-util.h Merge branch 'js/typofixes' 2018-08-20 11:33:50 -07:00
git-cvsexportcommit.perl
…
git-cvsimport.perl
…
git-cvsserver.perl
…
git-difftool--helper.sh
…
git-filter-branch.sh Merge branch 'mb/filter-branch-optim' 2018-07-18 12:20:32 -07:00
git-instaweb.sh git-instaweb: fix apache2 config with apache >= 2.4 2018-08-08 08:30:07 -07:00
git-merge-octopus.sh
…
git-merge-one-file.sh
…
git-merge-resolve.sh
…
git-mergetool--lib.sh
…
git-mergetool.sh mergetool: don't suggest to continue after last file 2018-08-13 12:11:19 -07:00
git-p4.py git-p4: add the `p4-pre-submit` hook 2018-08-01 13:37:18 -07:00
git-parse-remote.sh
…
git-quiltimport.sh
…
git-rebase--am.sh
…
git-rebase--interactive.sh Merge branch 'ag/rebase-p' 2018-06-25 13:22:39 -07:00
git-rebase--merge.sh Merge branch 'en/rebase-i-microfixes' 2018-07-18 12:20:33 -07:00
git-rebase--preserve-merges.sh git-rebase--preserve-merges: fix formatting of todo help message 2018-07-06 12:09:27 -07:00
git-rebase.sh Merge branch 'en/rebase-consistency' 2018-07-24 14:50:43 -07:00
git-remote-testgit.sh
…
git-request-pull.sh
…
git-send-email.perl Merge branch 'jm/send-email-tls-auth-on-batch' 2018-08-02 15:30:46 -07:00
git-sh-i18n.sh
…
git-sh-setup.sh
…
git-stash.sh
…
git-submodule.sh Revert "Merge branch 'sb/submodule-core-worktree'" 2018-09-07 19:05:20 -07:00
git-svn.perl
…
git-web--browse.sh
…
git.c Merge branch 'js/range-diff' 2018-08-20 11:33:53 -07:00
git.rc
…
gpg-interface.c Merge branch 'jc/gpg-status' 2018-08-20 11:33:50 -07:00
gpg-interface.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
graph.c
…
graph.h
…
grep.c Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07:00
grep.h Merge branch 'tb/grep-only-matching' 2018-08-02 15:30:44 -07:00
hash.h
…
hashmap.c
…
hashmap.h
…
help.c Merge branch 'hn/highlight-sideband-keywords' 2018-08-20 12:41:34 -07:00
help.h sideband: highlight keywords in remote sideband output 2018-08-08 15:20:09 -07:00
hex.c hex: switch to using the_hash_algo 2018-07-16 14:27:39 -07:00
http-backend.c Merge branch 'mk/http-backend-content-length' 2018-09-10 10:35:42 -07:00
http-fetch.c
…
http-push.c tag: add repository argument to deref_tag 2018-06-29 10:43:39 -07:00
http-walker.c
…
http.c refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x) 2018-08-17 10:08:56 -07:00
http.h Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
ident.c
…
imap-send.c
…
iterator.h
…
json-writer.c json_writer: new routines to create JSON data 2018-07-16 13:55:39 -07:00
json-writer.h json_writer: new routines to create JSON data 2018-07-16 13:55:39 -07:00
khash.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
kwset.c
…
kwset.h
…
levenshtein.c
…
levenshtein.h
…
line-log.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
line-log.h
…
line-range.c blame: prevent error if range ends past end of file 2018-06-15 10:29:13 -07:00
line-range.h line-range.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
linear-assignment.c linear-assignment: a function to solve least-cost assignment problems 2018-08-13 10:44:50 -07:00
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 list-objects: check if filter is NULL before using 2018-06-12 10:46:56 -07:00
list-objects-filter-options.h
…
list-objects-filter.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
list-objects-filter.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
list-objects.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
list-objects.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
list.h
…
ll-merge.c attr: remove an implicit dependency on the_index 2018-08-13 14:14:42 -07:00
ll-merge.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
lockfile.c
…
lockfile.h
…
log-tree.c Merge branch 'jk/core-use-replace-refs' 2018-08-15 15:08:23 -07:00
log-tree.h
…
ls-refs.c
…
ls-refs.h
…
mailinfo.c
…
mailinfo.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
mailmap.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
mailmap.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
match-trees.c Merge branch 'jk/merge-subtree-heuristics' 2018-08-17 13:09:55 -07:00
mem-pool.c block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
mem-pool.h block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
merge-blobs.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
merge-blobs.h
…
merge-recursive.c Merge branch 'en/directory-renames-nothanks' 2018-09-04 14:31:38 -07:00
merge-recursive.h Merge branch 'en/directory-renames-nothanks' 2018-09-04 14:31:38 -07:00
merge.c Merge branch 'en/dirty-merge-fixes' 2018-08-02 15:30:45 -07:00
mergesort.c
…
mergesort.h
…
name-hash.c
…
notes-cache.c commit: add repository argument to lookup_commit_reference_gently 2018-06-29 10:43:39 -07:00
notes-cache.h
…
notes-merge.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
notes-merge.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
notes-utils.c commit: add repository argument to lookup_commit 2018-06-29 10:43:39 -07:00
notes-utils.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
notes.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
notes.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
object-store.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
object.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
object.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
oidmap.c
…
oidmap.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
oidset.c
…
oidset.h
…
pack-bitmap-write.c Merge branch 'jt/remove-pack-bitmap-global' 2018-07-18 12:20:30 -07:00
pack-bitmap.c pack-bitmap: add free function 2018-06-21 12:22:48 -07:00
pack-bitmap.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
pack-check.c
…
pack-objects.c Merge branch 'nd/pack-deltify-regression-fix' 2018-08-22 11:17:05 -07:00
pack-objects.h Merge branch 'nd/pack-deltify-regression-fix' 2018-08-22 11:17:05 -07:00
pack-revindex.c
…
pack-revindex.h
…
pack-write.c
…
pack.h
…
packfile.c for_each_packed_object: support iterating in pack-order 2018-08-13 13:48:28 -07:00
packfile.h Merge branch 'jk/for-each-object-iteration' 2018-08-20 11:33:52 -07:00
pager.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
parse-options-cb.c commit: add repository argument to lookup_commit_reference 2018-06-29 10:43:39 -07:00
parse-options.c Merge branch 'rs/parse-opt-lithelp' 2018-08-17 13:09:56 -07:00
parse-options.h
…
patch-delta.c
…
patch-ids.c
…
patch-ids.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
path.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
path.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
pathspec.c pathspec.c: use the right index instead of the_index 2018-08-13 14:14:43 -07:00
pathspec.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
pkt-line.c pkt-line.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
pkt-line.h
…
preload-index.c preload-index.c: use the right index instead of the_index 2018-08-13 14:14:42 -07:00
pretty.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
pretty.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
prio-queue.c
…
prio-queue.h
…
progress.c
…
progress.h
…
prompt.c
…
prompt.h
…
protocol.c
…
protocol.h
…
quote.c
…
quote.h
…
range-diff.c range-diff: left-pad patch numbers 2018-08-13 10:44:52 -07:00
range-diff.h range-diff: also show the diff between patches 2018-08-13 10:44:50 -07:00
reachable.c tree: add repository argument to lookup_tree 2018-06-29 10:43:38 -07:00
reachable.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
read-cache.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
ref-filter.c Merge branch 'ot/ref-filter-object-info' 2018-08-17 13:09:57 -07:00
ref-filter.h
…
reflog-walk.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
reflog-walk.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
refs.c Merge branch 'jt/refspec-dwim-precedence-fix' 2018-08-17 13:09:55 -07:00
refs.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
refspec.c refspec.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
refspec.h refspec: add back a refspec_item_init() function 2018-06-11 10:11:31 -07:00
remote-curl.c Merge branch 'js/typofixes' 2018-08-20 11:33:50 -07:00
remote-testsvn.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
remote.c Merge branch 'jt/refspec-dwim-precedence-fix' 2018-08-17 13:09:55 -07:00
remote.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
replace-object.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
replace-object.h check_replace_refs: rename to read_replace_refs 2018-07-18 15:45:14 -07:00
repository.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
repository.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
rerere.c dir.c: remove an implicit dependency on the_index in pathspec code 2018-08-13 14:14:42 -07:00
rerere.h rerere.h: drop extern from function declaration 2018-08-03 10:42:55 -07:00
resolve-undo.c resolve-undo.c: use the right index instead of the_index 2018-08-13 14:14:44 -07:00
resolve-undo.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
revision.c dir.c: remove an implicit dependency on the_index in pathspec code 2018-08-13 14:14:42 -07:00
revision.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
run-command.c
…
run-command.h
…
send-pack.c shallow: add repository argument to is_repository_shallow 2018-05-18 08:13:10 +09:00
send-pack.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
sequencer.c Merge branch 'pw/rebase-i-author-script-fix' 2018-09-04 14:31:38 -07:00
sequencer.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
serve.c
…
serve.h
…
server-info.c tag: add repository argument to deref_tag 2018-06-29 10:43:39 -07:00
setup.c
…
sh-i18n--envsubst.c
…
sha1-array.c
…
sha1-array.h
…
sha1-file.c Merge branch 'nd/no-the-index' 2018-08-20 11:33:53 -07:00
sha1-lookup.c
…
sha1-lookup.h
…
sha1-name.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
sha1dc_git.c
…
sha1dc_git.h
…
shallow.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
shell.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
shortlog.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
sideband.c sideband: do not read beyond the end of input 2018-08-18 09:16:48 -07:00
sideband.h
…
sigchain.c
…
sigchain.h
…
split-index.c split-index: don't compare cached data of entries already marked for split index 2018-10-12 07:23:29 +09:00
split-index.h
…
strbuf.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
strbuf.h Merge branch 'en/rename-directory-detection-reboot' 2018-05-23 14:38:19 +09:00
streaming.c
…
streaming.h
…
string-list.c string-list.c: avoid conversion from void * to function pointer 2018-07-09 14:37:50 -07:00
string-list.h
…
sub-process.c
…
sub-process.h
…
submodule-config.c Merge branch 'jk/fsck-gitmodules-gently' 2018-08-02 15:30:39 -07:00
submodule-config.h submodule-config: make 'config_from_gitmodules' private 2018-06-26 12:56:12 -07:00
submodule.c Revert "Merge branch 'sb/submodule-core-worktree'" 2018-09-07 19:05:20 -07:00
submodule.h Revert "Merge branch 'sb/submodule-core-worktree'" 2018-09-07 19:05:20 -07:00
symlinks.c
…
tag.c Merge branch 'jt/tags-to-promised-blobs-fix' 2018-08-02 15:30:46 -07:00
tag.h tag.c: allow deref_tag to handle arbitrary repositories 2018-06-29 10:43:40 -07:00
tar.h
…
tempfile.c
…
tempfile.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
thread-utils.c
…
thread-utils.h
…
tmp-objdir.c
…
tmp-objdir.h
…
trace.c
…
trace.h
…
trailer.c
…
trailer.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
transport-helper.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
transport-internal.h fetch-pack: unify ref in and out param 2018-08-01 15:00:52 -07:00
transport.c Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
transport.h Merge branch 'jt/connectivity-check-after-unshallow' 2018-08-15 15:08:28 -07:00
tree-diff.c refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x) 2018-08-17 10:08:56 -07:00
tree-walk.c Merge branch 'bc/object-id' 2018-08-02 15:30:39 -07:00
tree-walk.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
tree.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
tree.h tree: allow lookup_tree to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
unicode-width.h unicode: update the width tables to Unicode 11 2018-07-09 14:02:51 -07:00
unimplemented.sh
…
unix-socket.c
…
unix-socket.h
…
unpack-trees.c attr: remove index from git_attr_set_direction() 2018-08-13 14:14:43 -07:00
unpack-trees.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
upload-pack.c Merge branch 'sb/object-store-lookup' 2018-08-02 15:30:42 -07:00
upload-pack.h
…
url.c
…
url.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
urlmatch.c
…
urlmatch.h urlmatch.h: fix include guard 2018-08-15 11:52:09 -07:00
usage.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
userdiff.c attr: remove an implicit dependency on the_index 2018-08-13 14:14:42 -07:00
userdiff.h
…
utf8.c Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
utf8.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
varint.c
…
varint.h
…
version.c
…
version.h
…
versioncmp.c
…
walker.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
walker.h
…
wildmatch.c
…
wildmatch.h
…
worktree.c
…
worktree.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
wrap-for-bin.sh
…
wrapper.c
…
write-or-die.c
…
ws.c attr: remove an implicit dependency on the_index 2018-08-13 14:14:42 -07:00
wt-status.c dir.c: remove an implicit dependency on the_index in pathspec code 2018-08-13 14:14:42 -07:00
wt-status.h
…
xdiff-interface.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
xdiff-interface.h
…
zlib.c
…

README.md

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