Go to file

Joachim Kuebart c3ab08844c git-p4: ensure complex branches are cloned correctly When importing a branch from p4, git-p4 searches the history of the parent branch for the branch point. The test for the complex branch structure ensures all files have the expected contents, but doesn't examine the branch structure. Check for the correct branch structure by making sure that the initial commit on each branch is empty. This ensures that the initial commit's parent is indeed the correct branch-off point. Signed-off-by: Joachim Kuebart <joachim.kuebart@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-05-06 12:51:31 +09:00
.github	Merge branch 'tb/ci-run-cocci-with-18.04' into maint	2021-02-11 13:57:36 -08:00
Documentation	Git 2.31.1	2021-03-26 14:49:41 -07:00
block-sha1	block-sha1: drop trailing semicolon from macro definition	2021-03-17 10:20:01 -07:00
builtin	Merge branch 'tb/git-mv-icase-fix'	2021-03-19 15:25:40 -07:00
ci	Merge branch 'tb/pack-revindex-on-disk'	2021-02-12 14:21:04 -08:00
compat	Sync with Git 2.30.2 for CVE-2021-21300	2021-03-08 16:09:07 -08:00
contrib	Merge branch 'rs/xcalloc-takes-nelem-first'	2021-03-19 15:25:39 -07:00
ewah	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
git-gui	Merge https://github.com/prati0100/git-gui	2021-03-04 12:38:50 -08:00
gitk-git	…
gitweb	…
mergetools	mergetools/vimdiff: add vimdiff1 merge tool variant	2021-02-23 11:37:13 -08:00
negotiator	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
perl	…
po	l10n: zh_CN: for git v2.31.0 l10n round 1 and 2	2021-03-15 00:05:25 +08:00
ppc	…
refs	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	git-p4: ensure complex branches are cloned correctly	2021-05-06 12:51:31 +09:00
templates	…
trace2	…
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.31.1	2021-03-26 14:49:41 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Makefile: update 'make fuzz-all' docs to reflect modern clang	2021-03-08 10:26:25 -08:00
README.md	…
RelNotes	Git 2.31.1	2021-03-26 14:49:41 -07:00
abspath.c	…
aclocal.m4	…
add-interactive.c	Merge branch 'rs/xcalloc-takes-nelem-first'	2021-03-19 15:25:39 -07:00
add-interactive.h	…
add-patch.c	…
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
apply.h	…
archive-tar.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
attr.h	…
banned.h	…
base85.c	…
bisect.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
bisect.h	…
blame.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
blame.h	…
blob.c	…
blob.h	…
bloom.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
bloom.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
cache-tree.h	…
cache.h	Sync with Git 2.30.2 for CVE-2021-21300	2021-03-08 16:09:07 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
chunk-format.c	chunk-format: restore duplicate chunk checks	2021-02-18 13:38:16 -08:00
chunk-format.h	chunk-format: create read chunk API	2021-02-18 13:38:16 -08:00
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
command-list.txt	…
commit-graph.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
commit-graph.h	…
commit-reach.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
commit.h	Merge branch 'bc/signed-objects-with-both-hashes'	2021-02-22 16:12:42 -08:00
common-main.c	…
config.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
config.h	Merge branch 'ps/config-env-pairs'	2021-01-25 14:19:19 -08:00
config.mak.dev	…
config.mak.in	…
config.mak.uname	Merge branch 'jk/open-returns-eintr'	2021-03-04 15:34:45 -08:00
configure.ac	…
connect.c	Merge branch 'jt/clone-unborn-head'	2021-02-17 17:21:40 -08:00
connect.h	…
connected.c	…
connected.h	…
convert.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
convert.h	…
copy.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
date.c	…
decorate.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	…
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
diff.h	Merge branch 'jc/diffcore-rotate'	2021-02-25 16:43:30 -08:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
diffcore-rotate.c	diff: --{rotate,skip}-to=<path>	2021-02-16 09:30:42 -08:00
diffcore.h	diff: --{rotate,skip}-to=<path>	2021-02-16 09:30:42 -08:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
dir.h	…
editor.c	…
entry.c	write_entry(): fix misuses of `path` in error messages	2021-02-16 11:27:17 -08:00
environment.c	…
environment.h	…
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
fetch-pack.h	…
fmt-merge-msg.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
fmt-merge-msg.h	…
fsck.c	Merge branch 'jt/transfer-fsck-across-packs'	2021-03-01 14:02:57 -08:00
fsck.h	Merge branch 'jt/transfer-fsck-across-packs'	2021-03-01 14:02:57 -08:00
fsmonitor.c	Merge branch 'jh/fsmonitor-prework'	2021-03-19 15:25:37 -07:00
fsmonitor.h	fsmonitor: log invocation of FSMonitor hook to trace2	2021-02-16 17:14:34 -08:00
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
generate-configlist.sh	…
gettext.c	Merge branch 'ab/detox-gettext-tests'	2021-02-10 14:48:33 -08:00
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	bisect--helper: reimplement `bisect_skip` shell function in C	2021-02-03 14:52:09 -08:00
git-compat-util.h	git-compat-util.h: drop trailing semicolon from macro definition	2021-03-13 15:56:13 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	mergetool: break setup_tool out into separate initialization function	2021-02-09 14:09:16 -08:00
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	Merge branch 'sh/mergetool-hideresolved'	2021-02-17 17:21:41 -08:00
git-mergetool.sh	mergetool: do not enable hideResolved by default	2021-03-13 15:30:29 -08:00
git-p4.py	Merge branch 'dl/p4-encode-after-kw-expansion' into maint	2021-02-08 14:05:54 -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	…
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'tb/precompose-prefix-too'	2021-02-12 14:21:04 -08:00
git.rc	…
gpg-interface.c	gpg-interface: remove other signature headers before verifying	2021-02-10 23:35:42 -08:00
gpg-interface.h	gpg-interface: improve interface for parsing tags	2021-02-10 23:35:42 -08:00
graph.c	…
graph.h	…
grep.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
grep.h	Merge branch 'ab/grep-pcre-invalid-utf8'	2021-02-10 14:48:33 -08:00
hash-lookup.c	oid_pos(): access table through const pointers	2021-01-28 12:03:26 -08:00
hash-lookup.h	oid_pos(): access table through const pointers	2021-01-28 12:03:26 -08:00
hash.h	…
hashmap.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
http-fetch.c	http-fetch: allow custom index-pack args	2021-02-22 12:07:40 -08:00
http-push.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
http-walker.c	…
http.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
http.h	http: allow custom index-pack args	2021-02-22 12:07:40 -08:00
ident.c	…
imap-send.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
kwset.c	…
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
line-log.h	…
line-range.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	…
list-objects-filter-options.h	…
list-objects-filter.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'ab/diff-deferred-free'	2021-02-22 16:12:43 -08:00
log-tree.h	…
ls-refs.c	Merge branch 'jt/clone-unborn-head'	2021-02-17 17:21:40 -08:00
ls-refs.h	ls-refs: report unborn targets of symrefs	2021-02-05 13:49:53 -08:00
mailinfo.c	…
mailinfo.h	…
mailmap.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
mailmap.h	…
match-trees.c	…
mem-pool.c	mem-pool: drop trailing semicolon from macro definition	2021-03-17 10:20:16 -07:00
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-ort-wrappers.c	…
merge-ort-wrappers.h	…
merge-ort.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
merge-ort.h	…
merge-recursive.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
midx.h	…
name-hash.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
notes-merge.h	…
notes-utils.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
notes-utils.h	…
notes.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
notes.h	…
object-file.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
object-name.c	…
object-store.h	packfile: prepare for the existence of '*.rev' files	2021-01-25 18:32:43 -08:00
object.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
object.h	…
oid-array.c	oid_pos(): access table through const pointers	2021-01-28 12:03:26 -08:00
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	oid_pos(): access table through const pointers	2021-01-28 12:03:26 -08:00
pack-bitmap.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
pack-bitmap.h	rev-list: add --disk-usage option for calculating disk usage	2021-02-11 09:57:55 -08:00
pack-check.c	…
pack-objects.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
pack-objects.h	…
pack-revindex.c	pack-revindex.c: don't close unopened file descriptors	2021-02-26 14:42:27 -08:00
pack-revindex.h	pack-revindex: ensure that on-disk reverse indexes are given precedence	2021-01-25 18:32:44 -08:00
pack-write.c	Merge branch 'jt/transfer-fsck-across-packs'	2021-03-01 14:02:57 -08:00
pack.h	Merge branch 'jt/transfer-fsck-across-packs'	2021-03-01 14:02:57 -08:00
packfile.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
packfile.h	packfile: prepare for the existence of '*.rev' files	2021-01-25 18:32:43 -08:00
pager.c	pager: refactor wait_for_pager() function	2021-02-01 21:15:58 -08:00
parse-options-cb.c	…
parse-options.c	MacOS: precompose_argv_prefix()	2021-02-03 14:09:37 -08:00
parse-options.h	…
patch-delta.c	…
patch-ids.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	preload-index: log the number of lstat calls to trace2	2021-02-16 17:14:34 -08:00
pretty.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
pretty.h	pretty.c: capture invalid trailer argument	2021-02-15 16:48:38 -08:00
prio-queue.c	…
prio-queue.h	…
progress.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
progress.h	…
promisor-remote.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
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 CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
range-diff.h	Merge branch 'js/range-diff-one-side-only'	2021-02-17 17:21:41 -08:00
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'rs/calloc-array'	2021-03-19 15:25:38 -07:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'rs/xcalloc-takes-nelem-first'	2021-03-19 15:25:39 -07:00
ref-filter.h	…
reflog-walk.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
reflog-walk.h	…
refs.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
refs.h	Merge branch 'tb/ls-refs-optim'	2021-02-05 16:40:45 -08:00
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
remote.h	Merge branch 'jt/clone-unborn-head'	2021-02-17 17:21:40 -08:00
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
repository.h	…
rerere.c	rerere: use strmap to store rerere directories	2021-01-28 11:26:20 -08:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
resolve-undo.h	…
revision.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
revision.h	Merge branch 'so/log-diff-merge'	2021-02-05 16:40:44 -08:00
run-command.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
run-command.h	…
send-pack.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
send-pack.h	…
sequencer.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
sequencer.h	…
serve.c	ls-refs: report unborn targets of symrefs	2021-02-05 13:49:53 -08:00
serve.h	…
server-info.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
setup.c	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	commit_graft_pos(): take an oid instead of a bare hash	2021-01-28 11:21:07 -08:00
shallow.h	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
split-index.h	…
stable-qsort.c	…
strbuf.c	…
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	Sync with 2.20.5	2021-02-12 15:49:35 +01:00
tag.c	gpg-interface: improve interface for parsing tags	2021-02-10 23:35:42 -08:00
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	packfile: prepare for the existence of '*.rev' files	2021-01-25 18:32:43 -08:00
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	…
trace2.h	…
trailer.c	Merge branch 'rs/xcalloc-takes-nelem-first'	2021-03-19 15:25:39 -07:00
trailer.h	…
transport-helper.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
transport-internal.h	connect, transport: encapsulate arg in struct	2021-02-05 13:49:54 -08:00
transport.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
transport.h	clone: respect remote unborn HEAD	2021-02-05 13:49:55 -08: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	…
unpack-trees.c	Merge branch 'js/fsmonitor-unpack-fix'	2021-03-19 15:25:37 -07:00
unpack-trees.h	…
upload-pack.c	Merge branch 'ak/corrected-commit-date'	2021-02-17 17:21:40 -08:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	usage: trace2 BUG() invocations	2021-02-09 14:14:34 -08:00
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	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
worktree.h	worktree: teach worktree to lazy-load "prunable" reason	2021-01-30 09:57:16 -08:00
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	use CALLOC_ARRAY	2021-03-13 16:00:09 -08:00
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