Go to file

Elijah Newren b8cd1bb713 t6036, t6043: increase code coverage for file collision handling Stolee's coverage reports found a few code blocks for file collision conflicts that had not previously been covered by testcases; add a few more testcases to cover those too. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2018-11-08 14:23:54 +09:00
.github	…
Documentation	Merge branch 'ab/fetch-tags-noclobber'	2018-09-17 13:54:00 -07:00
block-sha1	…
builtin	Merge branch 'ab/fetch-tags-noclobber'	2018-09-17 13:54:00 -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	convert "hashcmp() != 0" to "!hasheq()"	2018-08-29 11:32:49 -07:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
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	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
sha1collisiondetection@232357eb2e	…
sha1dc	…
t	t6036, t6043: increase code coverage for file collision handling	2018-11-08 14:23:54 +09:00
templates	…
vcs-svn	…
xdiff	Merge branch 'sb/indent-heuristic-optim'	2018-08-17 13:09:57 -07:00
.clang-format	…
.gitattributes	.gitattributes: add conflict-marker-size for relevant files	2018-08-29 11:27:31 -07:00
.gitignore	Sync 'ds/multi-pack-index' to v2.19.0-rc0	2018-08-20 15:29:54 -07:00
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	Initial batch post 2.19	2018-09-17 14:16:29 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'es/format-patch-interdiff'	2018-09-17 13:53:55 -07:00
README.md	…
RelNotes	Initial batch post 2.19	2018-09-17 14:16:29 -07:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	…
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.h	Merge branch 'en/incl-forward-decl'	2018-08-20 12:41:32 -07:00
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	Merge branch 'en/incl-forward-decl'	2018-08-20 12:41:32 -07:00
banned.h	…
base85.c	…
bisect.c	Merge branch 'nd/bisect-show-list-fix'	2018-09-17 13:54:00 -07:00
bisect.h	…
blame.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
blame.h	…
blob.c	…
blob.h	…
branch.c	Merge branch 'ab/unconditional-free-and-null'	2018-08-27 14:33:42 -07:00
branch.h	…
builtin.h	Sync 'ds/multi-pack-index' to v2.19.0-rc0	2018-08-20 15:29:54 -07:00
bulk-checkin.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07:00
bulk-checkin.h	…
bundle.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
bundle.h	…
cache-tree.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
cache-tree.h	Merge branch 'nd/unpack-trees-with-cache-tree'	2018-09-17 13:53:53 -07:00
cache.h	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07:00
command-list.txt	Sync 'ds/multi-pack-index' to v2.19.0-rc0	2018-08-20 15:29:54 -07:00
commit-graph.c	Merge branch 'ds/commit-graph-tests'	2018-09-17 13:53:58 -07:00
commit-graph.h	Merge branch 'ds/commit-graph-tests'	2018-09-17 13:53:58 -07:00
commit-reach.c	Merge branch 'ds/reachable'	2018-09-17 13:53:52 -07:00
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
commit.h	Merge branch 'jk/trailer-fixes'	2018-09-17 13:53:54 -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	…
config.mak.in	…
config.mak.uname	Merge branch 'es/freebsd-iconv-portability'	2018-09-04 14:31:39 -07:00
configure.ac	…
connect.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07:00
connect.h	…
connected.c	…
connected.h	…
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	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta-islands.c	pack-objects: move 'layer' into 'struct packing_data'	2018-08-16 10:56:44 -07:00
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
diff-no-index.c	…
diff.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
diff.h	Merge branch 'sb/range-diff-colors'	2018-09-17 13:53:54 -07:00
diffcore-break.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07:00
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
diffcore.h	Merge branch 'en/incl-forward-decl'	2018-08-20 12:41:32 -07:00
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
dir.h	…
editor.c	…
entry.c	Merge branch 'nd/clone-case-smashing-warning'	2018-09-17 13:53:47 -07:00
environment.c	Merge branch 'en/incl-forward-decl'	2018-08-20 12:41:32 -07:00
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-object.c	…
fetch-object.h	…
fetch-pack.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
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	…
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	…
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-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--am.sh	…
git-rebase--interactive.sh	…
git-rebase--merge.sh	…
git-rebase--preserve-merges.sh	…
git-rebase.sh	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	Merge branch 'sb/submodule-update-in-c'	2018-09-17 13:53:51 -07:00
git-svn.perl	…
git-web--browse.sh	…
git.c	Sync 'ds/multi-pack-index' to v2.19.0-rc0	2018-08-20 15:29:54 -07:00
git.rc	…
gpg-interface.c	Merge branch 'jc/gpg-status'	2018-08-20 11:33:50 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	Merge branch 'hn/highlight-sideband-keywords'	2018-08-20 12:41:34 -07:00
help.h	…
hex.c	…
http-backend.c	Merge branch 'ds/multi-pack-index'	2018-09-17 13:53:50 -07:00
http-fetch.c	…
http-push.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
http-walker.c	convert "hashcmp() != 0" to "!hasheq()"	2018-08-29 11:32:49 -07:00
http.c	convert "hashcmp() != 0" to "!hasheq()"	2018-08-29 11:32:49 -07:00
http.h	…
ident.c	…
imap-send.c	…
interdiff.c	…
interdiff.h	…
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	merge-recursive: increase marker length with depth of recursion	2018-11-08 14:23:53 +09:00
ll-merge.h	merge-recursive: increase marker length with depth of recursion	2018-11-08 14:23:53 +09:00
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	mailinfo: support format=flowed	2018-08-29 13:05:35 -07:00
mailinfo.h	Merge branch 'rs/mailinfo-format-flowed'	2018-09-17 13:53:57 -07:00
mailmap.c	…
mailmap.h	…
match-trees.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	merge-recursive: improve rename/rename(1to2)/add[/add] handling	2018-11-08 14:23:53 +09:00
merge-recursive.h	Merge branch 'en/directory-renames-nothanks'	2018-09-04 14:31:38 -07:00
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	packfile: add all_packs list	2018-08-20 15:31:40 -07:00
midx.h	packfile: add all_packs list	2018-08-20 15:31:40 -07:00
name-hash.c	trace.h: support nested performance tracing	2018-08-18 09:47:46 -07:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
notes.h	…
object-store.h	packfile: add all_packs list	2018-08-20 15:31:40 -07:00
object.c	convert "hashcmp() == 0" to hasheq()	2018-08-29 11:32:49 -07:00
object.h	Merge branch 'ds/reachable'	2018-09-17 13:53:52 -07:00
oidmap.c	convert hashmap comparison functions to oideq()	2018-08-29 11:32:49 -07:00
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	Merge branch 'ds/reachable'	2018-09-17 13:53:52 -07:00
pack-bitmap.c	Merge branch 'jk/pack-objects-with-bitmap-fix'	2018-09-17 13:53:58 -07:00
pack-bitmap.h	bitmap_has_sha1_in_uninteresting(): drop BUG check	2018-09-04 08:30:48 -07:00
pack-check.c	convert "hashcmp() != 0" to "!hasheq()"	2018-08-29 11:32:49 -07:00
pack-objects.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
pack-objects.h	Merge branch 'cc/delta-islands'	2018-09-17 13:53:55 -07:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	convert "hashcmp() != 0" to "!hasheq()"	2018-08-29 11:32:49 -07:00
pack.h	…
packfile.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
packfile.h	packfile: add all_packs list	2018-08-20 15:31:40 -07:00
pager.c	…
parse-options-cb.c	…
parse-options.c	Merge branch 'rs/parse-opt-lithelp'	2018-08-17 13:09:56 -07:00
parse-options.h	…
patch-delta.c	patch-delta: handle truncated copy parameters	2018-08-30 10:30:23 -07:00
patch-ids.c	convert hashmap comparison functions to oideq()	2018-08-29 11:32:49 -07:00
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	Merge branch 'nd/unpack-trees-with-cache-tree'	2018-09-17 13:53:53 -07:00
pretty.c	Merge branch 'jk/trailer-fixes'	2018-09-17 13:53:54 -07:00
pretty.h	…
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	Merge branch 'es/format-patch-rangediff'	2018-09-17 13:53:56 -07:00
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
ref-filter.c	Merge branch 'jk/trailer-fixes'	2018-09-17 13:53:54 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	Merge branch 'js/typofixes'	2018-08-20 11:33:50 -07:00
remote-testsvn.c	…
remote.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
remote.h	Merge branch 'ds/reachable'	2018-09-17 13:53:52 -07:00
replace-object.c	…
replace-object.h	…
repository.c	…
repository.h	Merge branch 'en/incl-forward-decl'	2018-08-20 12:41:32 -07:00
rerere.c	Merge branch 'tg/rerere'	2018-09-17 13:53:51 -07:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
revision.h	Merge branch 'es/format-patch-rangediff'	2018-09-17 13:53:56 -07:00
run-command.c	…
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
sequencer.h	Merge branch 'jk/trailer-fixes'	2018-09-17 13:53:54 -07:00
serve.c	…
serve.h	…
server-info.c	treewide: use get_all_packs	2018-08-20 15:31:40 -07:00
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07:00
sha1-array.h	…
sha1-file.c	convert "hashcmp() != 0" to "!hasheq()"	2018-08-29 11:32:49 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shell.c	…
shortlog.h	…
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.h	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
submodule-config.h	…
submodule.c	Merge branch 'jk/cocci'	2018-09-17 13:53:57 -07:00
submodule.h	Revert "Merge branch 'sb/submodule-core-worktree'"	2018-09-07 19:05:20 -07:00
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: support nested performance tracing	2018-08-18 09:47:46 -07:00
trace.h	trace.h: support nested performance tracing	2018-08-18 09:47:46 -07:00
trailer.c	interpret-trailers: allow suppressing "---" divider	2018-08-23 10:08:51 -07:00
trailer.h	Merge branch 'jk/trailer-fixes'	2018-09-17 13:53:54 -07:00
transport-helper.c	…
transport-internal.h	…
transport.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07:00
transport.h	…
tree-diff.c	convert "oidcmp() != 0" to "!oideq()"	2018-08-29 11:32:49 -07:00
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 'jk/cocci'	2018-09-17 13:53:57 -07:00
unpack-trees.h	Merge branch 'nd/clone-case-smashing-warning'	2018-09-17 13:53:47 -07:00
upload-pack.c	Merge branch 'ds/reachable'	2018-09-17 13:53:52 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
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	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	worktree: don't die() in library function find_worktree()	2018-08-30 09:28:02 -07:00
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07:00
wt-status.h	…
xdiff-interface.c	convert "oidcmp() == 0" to oideq()	2018-08-29 11:32:49 -07: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