Go to file

Derrick Stolee 448a39e65d commit-graph: validate layers for generation data We need to be extra careful that we don't use corrected commit dates from any layer of a commit-graph chain if there is a single commit-graph file that is missing the generation_data chunk. Update validate_mixed_generation_chain() to correctly update each layer to ignore the generation_data chunk in this case. It now also returns 1 if all layers have a generation_data chunk. This return value will be used in the next change. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-02-01 21:03:36 -08:00
.github	Merge branch 'da/vs-build-iconv-fix'	2020-12-14 10:21:38 -08:00
Documentation	doc: add corrected commit date info	2021-01-18 16:21:18 -08:00
block-sha1	block-sha1: take a size_t length parameter	2020-11-16 13:41:35 -08:00
builtin	Merge branch 'ma/maintenance-crontab-fix'	2020-12-23 13:59:46 -08:00
ci	ci: avoid `set-env` construct in print-test-failures.sh	2020-11-17 12:12:30 -08:00
compat	Merge branch 'da/vs-build-iconv-fix'	2020-12-14 10:21:38 -08:00
contrib	Merge branch 'js/cmake-extra-built-ins-fix'	2020-12-14 10:21:38 -08:00
ewah	…
git-gui	Merge https://github.com/prati0100/git-gui	2020-12-18 15:07:10 -08:00
gitk-git	…
gitweb	gitweb/Makefile: conditionally include ../GIT-VERSION-FILE	2020-12-08 16:56:56 -08:00
mergetools	Merge branch 'pd/mergetool-nvimdiff'	2020-11-21 15:14:39 -08:00
negotiator	…
perl	Merge branch 'jk/perl-warning'	2020-11-09 14:06:25 -08:00
po	l10n: zh_CN: for git v2.30.0 l10n round 1 and 2	2020-12-27 19:23:27 +08:00
ppc	…
refs	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	commit-graph: always parse before commit_graph_data_at()	2021-02-01 21:03:36 -08:00
templates	…
trace2	…
vcs-svn	…
xdiff	diff: add -I<regex> that ignores matching changes	2020-10-20 12:53:26 -07:00
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	Merge branch 'fc/random-cleanup'	2020-12-08 15:11:21 -08:00
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.30	2020-12-27 15:15:23 -08:00
INSTALL	doc: mention Python 3.x supports	2020-12-14 15:01:03 -08:00
LGPL-2.1	…
Makefile	Merge branch 'dd/doc-p4-requirements-update'	2020-12-18 15:15:17 -08:00
README.md	…
RelNotes	Git 2.29.2	2020-10-29 14:24:09 -07:00
abspath.c	…
aclocal.m4	…
add-interactive.c	Merge branch 'js/add-i-color-fix'	2020-12-08 15:11:17 -08:00
add-interactive.h	…
add-patch.c	Merge branch 'js/add-i-color-fix'	2020-12-08 15:11:17 -08:00
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'ab/unreachable-break'	2020-12-18 15:15:18 -08:00
apply.h	…
archive-tar.c	archive: support compression levels beyond 9	2020-11-09 11:25:45 -08:00
archive-zip.c	…
archive.c	Merge branch 'rs/archive-plug-leak-refname'	2020-11-25 15:24:53 -08:00
archive.h	Merge branch 'rs/archive-plug-leak-refname'	2020-11-25 15:24:53 -08:00
attr.c	Use new HASHMAP_INIT macro to simplify hashmap initialization	2020-11-11 12:55:27 -08:00
attr.h	…
banned.h	banned.h: mark ctime_r() and asctime_r() as banned	2020-12-02 14:30:39 -08:00
base85.c	…
bisect.c	Merge branch 'sg/bisect-approximately-halfway'	2020-11-25 15:24:52 -08:00
bisect.h	…
blame.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
blame.h	blame: simplify 'setup_blame_bloom_data' interface	2020-11-01 15:54:15 -08:00
blob.c	…
blob.h	…
bloom.c	Use new HASHMAP_INIT macro to simplify hashmap initialization	2020-11-11 12:55:27 -08:00
bloom.h	…
branch.c	…
branch.h	…
builtin.h	Merge branch 'ds/maintenance-part-3'	2020-11-18 13:32:53 -08:00
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'jk/oid-array-cleanup'	2020-12-17 15:06:40 -08: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	Merge branch 'ab/retire-parse-remote'	2020-12-03 00:18:06 -08:00
commit-graph.c	commit-graph: validate layers for generation data	2021-02-01 21:03:36 -08:00
commit-graph.h	commit-reach: use corrected commit dates in paint_down_to_common()	2021-01-18 16:21:18 -08:00
commit-reach.c	commit-reach: use corrected commit dates in paint_down_to_common()	2021-01-18 16:21:18 -08:00
commit-reach.h	commit-graph: return 64-bit generation number	2021-01-18 16:21:18 -08:00
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	commit-graph: return 64-bit generation number	2021-01-18 16:21:18 -08:00
commit.h	commit-graph: use repo_parse_commit	2021-02-01 21:03:35 -08:00
common-main.c	…
config.c	Merge branch 'ds/config-literal-value'	2020-12-08 15:11:19 -08:00
config.h	config: plumb --fixed-value into config API	2020-11-25 14:43:48 -08:00
config.mak.dev	Merge branch 'jc/sparse-error-for-developer-build'	2020-11-18 13:32:54 -08:00
config.mak.in	…
config.mak.uname	Merge branch 'rb/nonstop-config-mak-uname-update'	2020-12-18 15:15:18 -08:00
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	csum-file: add hashwrite_be64()	2020-11-12 09:40:06 -08:00
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	Merge branch 'rs/plug-diff-cache-leak'	2020-11-25 15:24:53 -08:00
diff-no-index.c	…
diff.c	Merge branch 'jc/diff-I-status-fix'	2020-12-18 15:15:18 -08:00
diff.h	Merge branch 'mk/diff-ignore-regex'	2020-11-02 13:17:44 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'rs/fetch-pack-invalid-lockfile'	2020-12-08 15:11:20 -08:00
fetch-pack.h	…
fmt-merge-msg.c	fmt-merge-msg: also suppress "into main" by default	2020-10-23 08:57:39 -07:00
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
generate-configlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	Merge branch 'js/add-i-color-fix'	2020-12-08 15:11:17 -08:00
git-archimport.perl	…
git-bisect.sh	Merge branch 'mr/bisect-in-c-3'	2020-11-09 14:06:25 -08:00
git-compat-util.h	Merge branch 'jc/compat-util-setitimer-fix'	2020-12-18 15:15:17 -08: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	mergetool: avoid letting `list_tool_variants` break user-defined setups	2020-11-11 13:00:11 -08:00
git-mergetool.sh	…
git-p4.py	Merge branch 'js/p4-default-branch'	2020-11-11 13:18:38 -08:00
git-quiltimport.sh	…
git-rebase--preserve-merges.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	submodule: fix fetch_in_submodule logic	2020-11-24 13:14:09 -08:00
git-svn.perl	perl: check for perl warnings while running tests	2020-10-21 23:11:48 -07:00
git-web--browse.sh	…
git.c	maintenance: fix SEGFAULT when no repository	2020-11-30 13:44:15 -08:00
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	grep: copy struct in one fell swoop	2020-11-30 13:55:54 -08:00
grep.h	grep: use designated initializers for `grep_defaults`	2020-11-21 14:50:33 -08:00
hash.h	cache.h: move hash/oid functions to hash.h	2020-12-04 13:55:14 -08:00
hashmap.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
hashmap.h	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
help.c	help.c: help.autocorrect=never means "do not compute suggestions"	2020-11-25 13:02:15 -08:00
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
imap-send.c	imap-send: parse default git config	2020-12-01 11:10:59 -08:00
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: fix function name in BUG	2020-11-16 14:28:25 -08:00
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.h	…
log-tree.c	format-patch: make output filename configurable	2020-11-09 17:44:41 -08:00
log-tree.h	format-patch: make output filename configurable	2020-11-09 17:44:41 -08:00
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-ort-wrappers.c	merge-ort-wrappers: new convience wrappers to mimic the old merge API	2020-10-26 22:36:14 -07:00
merge-ort-wrappers.h	merge-ort-wrappers: new convience wrappers to mimic the old merge API	2020-10-26 22:36:14 -07:00
merge-ort.c	merge-ort: barebones API of new merge strategy with empty implementation	2020-10-26 22:36:10 -07:00
merge-ort.h	merge-ort: barebones API of new merge strategy with empty implementation	2020-10-26 22:36:10 -07:00
merge-recursive.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	Merge branch 'tb/idx-midx-race-fix'	2020-12-08 15:11:18 -08:00
midx.h	…
name-hash.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	Merge branch 'na/notes-displayref-is-not-boolean'	2020-11-30 14:49:44 -08:00
notes.h	…
object-store.h	…
object.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
object.h	object: allow clear_commit_marks_all to handle any repo	2020-10-31 10:46:34 -07:00
oid-array.c	oid-array: provide a for-loop iterator	2020-12-07 12:32:04 -08:00
oid-array.h	oid-array: provide a for-loop iterator	2020-12-07 12:32:04 -08:00
oidmap.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
oidmap.h	…
oidset.c	blame: silently ignore invalid ignore file objects	2020-11-10 13:05:06 -08:00
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	fsck: correctly compute checksums on idx files larger than 4GB	2020-11-16 13:41:35 -08:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	compute pack .idx byte offsets using size_t	2020-11-16 13:41:35 -08:00
pack-revindex.h	…
pack-write.c	Merge branch 'rs/hashwrite-be64'	2020-11-25 15:24:52 -08:00
pack.h	…
packfile.c	Merge branch 'tb/idx-midx-race-fix'	2020-12-08 15:11:18 -08:00
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	sideband: diagnose more sideband anomalies	2020-10-29 09:23:29 -07:00
pkt-line.h	…
preload-index.c	…
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	Use new HASHMAP_INIT macro to simplify hashmap initialization	2020-11-11 12:55:27 -08:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	init: provide useful advice about init.defaultBranch	2020-12-13 15:53:51 -08:00
refs.h	get_default_branch_name(): prepare for showing some advice	2020-12-13 15:53:50 -08:00
refspec.c	Merge branch 'fc/atmark-in-refspec'	2020-12-14 10:21:36 -08:00
refspec.h	Merge branch 'sb/clone-origin'	2020-10-27 15:09:50 -07:00
remote-curl.c	…
remote.c	Merge branch 'nk/refspecs-negative-fix'	2020-12-23 13:59:46 -08:00
remote.h	Merge branch 'sk/force-if-includes'	2020-10-27 15:09:49 -07:00
replace-object.c	…
replace-object.h	…
repo-settings.c	Merge branch 'ds/maintenance-part-2'	2020-10-27 15:09:47 -07:00
repository.c	…
repository.h	Merge branch 'ds/maintenance-part-2'	2020-10-27 15:09:47 -07:00
rerere.c	…
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	commit-graph: return 64-bit generation number	2021-01-18 16:21:18 -08:00
revision.h	format-patch: make output filename configurable	2020-11-09 17:44:41 -08:00
run-command.c	…
run-command.h	…
send-pack.c	Merge branch 'js/trace2-session-id'	2020-12-08 15:11:20 -08:00
send-pack.h	…
sequencer.c	Merge branch 'en/strmap'	2020-11-21 15:14:38 -08:00
sequencer.h	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
serve.c	upload-pack, serve: log received client session ID	2020-11-11 18:26:53 -08:00
serve.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-file.c	apply: don't use core.sharedRepository to create working tree files	2020-12-02 14:35:51 -08:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shell.c	…
shortlog.h	…
sideband.c	Merge branch 'jk/sideband-more-error-checking'	2020-11-09 14:06:29 -08:00
sideband.h	sideband: diagnose more sideband anomalies	2020-10-29 09:23:29 -07:00
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
strmap.c	strmap: take advantage of FLEXPTR_ALLOC_STR when relevant	2020-11-11 12:55:27 -08:00
strmap.h	strmap: make callers of strmap_remove() to call it in void context	2020-12-15 15:30:44 -08:00
strvec.c	…
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	hashmap: provide deallocation function names	2020-11-02 12:15:50 -08:00
submodule-config.h	…
submodule.c	Revert "submodules: fix of regression on fetching of non-init subsub-repo"	2020-12-02 15:07:14 -08:00
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: add a public function for getting the SID	2020-11-11 18:26:52 -08:00
trace2.h	trace2: add a public function for getting the SID	2020-11-11 18:26:52 -08:00
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	transport: log received server session ID	2020-11-11 18:26:53 -08:00
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: return 64-bit generation number	2021-01-18 16:21:18 -08:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	Merge branch 'jt/trace-error-on-warning'	2020-12-08 15:11:17 -08:00
userdiff.c	Merge branch 've/userdiff-bash'	2020-11-02 13:17:46 -08:00
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

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 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://lore.kernel.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