Go to file

Torsten Bögershausen 93c3d297b5 git mv foo FOO ; git mv foo bar gave an assert The following sequence, on a case-insensitive file system, (strictly speeking with core.ignorecase=true) leads to an assertion failure and leaves .git/index.lock behind. git init echo foo >foo git add foo git mv foo FOO git mv foo bar This regression was introduced in Commit `9b906af657`, "git-mv: improve error message for conflicted file" The bugfix is to change the "file exist case-insensitive in the index" into the correct "file exist (case-sensitive) in the index". This avoids the "assert" later in the code and keeps setting up the "ce" pointer for ce_stage(ce) done in the next else if. This fixes https://github.com/git-for-windows/git/issues/2920 Reported-By: Dan Moseley <Dan.Moseley@microsoft.com> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-03-03 17:07:12 -08:00
.github	…
Documentation	Git 2.26.2	2020-04-19 16:32:24 -07:00
block-sha1	…
builtin	git mv foo FOO ; git mv foo bar gave an assert	2021-03-03 17:07:12 -08:00
ci	Merge branch 'js/ci-windows-update'	2020-03-05 10:43:04 -08:00
compat	Merge branch 'js/mingw-open-in-gdb' into maint	2020-03-17 15:02:25 -07:00
contrib	Merge branch 'kk/complete-diff-color-moved'	2020-03-09 11:21:20 -07:00
ewah	Merge branch 'jk/object-filter-with-bitmap'	2020-03-02 15:07:18 -08:00
git-gui	Merge https://github.com/prati0100/git-gui	2020-03-19 16:06:51 -07:00
gitk-git	…
gitweb	Merge branch 'do/gitweb-typofix-in-comments'	2020-01-08 12:44:11 -08:00
mergetools	…
negotiator	…
perl	…
po	l10n: tr.po: change file mode to 644	2020-03-21 18:26:56 +08:00
ppc	…
refs	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	git-mv: improve error message for conflicted file	2020-07-20 14:35:43 -07:00
templates	Merge branch 'kw/fsmonitor-watchman-racefix'	2020-02-14 12:54:20 -08:00
trace2	…
vcs-svn	…
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	editorconfig: indent text files with tabs	2020-01-06 08:46:32 -08:00
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	Merge branch 'bc/wildcard-credential'	2020-03-05 10:43:02 -08:00
.travis.yml	…
.tsan-suppressions	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.26.2	2020-04-19 16:32:24 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'bw/remote-rename-update-config'	2020-02-25 11:18:32 -08:00
README.md	…
RelNotes	Git 2.26.2	2020-04-19 16:32:24 -07:00
abspath.c	…
aclocal.m4	…
add-interactive.c	Merge branch 'js/builtin-add-i-cmds' into maint	2020-03-17 15:02:20 -07:00
add-interactive.h	built-in add -p: respect the `interactive.singlekey` config setting	2020-01-15 12:06:17 -08:00
add-patch.c	built-in add -p: respect the `interactive.singlekey` config setting	2020-01-15 12:06:17 -08:00
advice.c	add: change advice config variables used by the add API	2020-02-06 11:08:00 -08:00
advice.h	add: change advice config variables used by the add API	2020-02-06 11:08:00 -08:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
apply.h	…
archive-tar.c	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
archive-zip.c	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
azure-pipelines.yml	Azure Pipeline: switch to the latest agent pools	2020-02-27 09:58:43 -08:00
banned.h	…
base85.c	…
bisect.c	bisect: libify `bisect_next_all`	2020-02-19 09:37:15 -08:00
bisect.h	bisect: libify `bisect_next_all`	2020-02-19 09:37:15 -08:00
blame.c	…
blame.h	blame: provide type of fingerprints pointer	2020-02-24 12:08:48 -08:00
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
cache-tree.h	…
cache.h	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	color.c: alias RGB colors 8-15 to aixterm colors	2020-02-11 11:19:00 -08:00
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	Merge branch 'rs/commit-graph-code-simplification'	2020-03-05 10:43:04 -08:00
commit-graph.h	commit-graph.h: use odb in 'load_commit_graph_one_fd_st'	2020-02-04 11:36:51 -08:00
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'rs/strbuf-insertstr'	2020-02-17 13:22:17 -08:00
commit.h	gpg-interface: add minTrustLevel as a configuration option	2020-01-15 14:06:06 -08:00
common-main.c	…
config.c	Merge branch 'bw/remote-rename-update-config'	2020-02-25 11:18:32 -08:00
config.h	config: provide access to the current line number	2020-02-10 10:52:10 -08:00
config.mak.dev	config.mak.dev: re-enable -Wformat-zero-length	2020-02-28 08:39:45 -08:00
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	connected: verify promisor-ness of partial clone	2020-01-30 10:55:31 -08:00
connected.h	connected: verify promisor-ness of partial clone	2020-01-30 10:55:31 -08:00
convert.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	Git 2.26.2	2020-04-19 16:32:24 -07:00
credential.h	Git 2.26.1	2020-03-25 13:07:47 -07:00
csum-file.c	…
csum-file.h	csum-file: introduce hashfile_total()	2020-01-23 10:51:50 -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	…
diff-no-index.c	…
diff.c	Merge branch 'mt/use-passed-repo-more-in-funcs'	2020-02-14 12:54:22 -08:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	sha1-file: pass git_hash_algo to hash_object_file()	2020-01-31 10:45:39 -08:00
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'ds/sparse-add'	2020-03-05 10:43:02 -08:00
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	Git 2.25.4	2020-04-19 16:31:07 -07:00
fsck.h	…
fsmonitor.c	fsmonitor: handle version 2 of the hooks that will use opaque token	2020-01-13 14:58:43 -08:00
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-legacy-stash.sh	Merge branch 'js/patch-mode-in-others-in-c'	2020-02-05 14:34:58 -08: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-p4: avoid leak of file handle when cloning	2020-01-30 12:21:13 -08:00
git-parse-remote.sh	…
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	Merge branch 'es/recursive-single-branch-clone'	2020-03-05 10:43:03 -08:00
git-svn.perl	…
git-web--browse.sh	…
git.c	…
git.rc	…
gpg-interface.c	Merge branch 'hi/gpg-use-check-signature'	2020-03-05 10:43:05 -08:00
gpg-interface.h	Merge branch 'hi/gpg-use-check-signature'	2020-03-05 10:43:05 -08:00
graph.c	graph: fix collapse of multiple edges	2020-01-15 12:14:51 -08:00
graph.h	…
grep.c	grep: replace grep_read_mutex by internal obj read lock	2020-01-17 13:52:14 -08:00
grep.h	grep: replace grep_read_mutex by internal obj read lock	2020-01-17 13:52:14 -08:00
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	Git 2.26.2	2020-04-19 16:32:24 -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	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'hd/show-one-mergetag-fix' into maint	2020-03-17 15:02:24 -07:00
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	Merge branch 'rs/micro-cleanups'	2020-03-02 15:07:20 -08:00
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint	2020-03-17 15:02:23 -07:00
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	nth_packed_object_oid(): use customary integer return	2020-02-24 12:55:42 -08:00
midx.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	strbuf: add and use strbuf_insertstr()	2020-02-10 09:04:45 -08:00
notes-utils.h	…
notes.c	Merge branch 'jh/notes-fanout-fix' into maint	2020-03-17 15:02:22 -07:00
notes.h	…
object-store.h	packed_object_info(): use object_id for returning delta base	2020-02-24 12:55:53 -08:00
object.c	Merge branch 'jk/object-filter-with-bitmap'	2020-03-02 15:07:18 -08:00
object.h	pack-bitmap: fix leak of haves/wants object lists	2020-02-13 09:08:58 -08:00
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	Merge branch 'jk/nth-packed-object-id'	2020-03-05 10:43:03 -08:00
pack-bitmap.h	Merge branch 'jk/object-filter-with-bitmap'	2020-03-02 15:07:18 -08:00
pack-check.c	pack-check: push oid lookup into loop	2020-02-24 12:55:53 -08:00
pack-objects.c	pack-objects: convert oe_set_delta_ext() to use object_id	2020-02-24 12:55:52 -08:00
pack-objects.h	pack-objects: convert oe_set_delta_ext() to use object_id	2020-02-24 12:55:52 -08:00
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	packfile: drop nth_packed_object_sha1()	2020-02-24 12:55:53 -08:00
packfile.h	packfile: drop nth_packed_object_sha1()	2020-02-24 12:55:53 -08:00
pager.c	…
parse-options-cb.c	parse-options: simplify parse_options_dup()	2020-02-10 09:45:49 -08:00
parse-options.c	Merge branch 'pb/am-show-current-patch'	2020-03-09 11:21:19 -07:00
parse-options.h	Merge branch 'pb/am-show-current-patch'	2020-03-09 11:21:19 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	normalize_path_copy(): document "dst" size expectations	2020-01-30 13:45:58 -08:00
path.h	…
pathspec.c	prefix_path: show gitdir if worktree unavailable	2020-03-15 09:35:46 -07:00
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	Merge branch 'rs/strbuf-insertstr'	2020-02-17 13:22:17 -08:00
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	…
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.h	…
protocol.c	fetch: default to protocol version 2	2020-01-15 14:03:55 -08:00
protocol.h	…
quote.c	quote: use isalnum() to check for alphanumeric characters	2020-02-24 09:30:29 -08:00
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	pack-bitmap: basic noop bitmap filter infrastructure	2020-02-14 10:46:22 -08:00
reachable.h	…
read-cache.c	Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'	2020-01-10 14:45:27 -08:00
rebase-interactive.c	Merge branch 'rt/format-zero-length-fix'	2020-03-09 11:21:21 -07:00
rebase-interactive.h	Merge branch 'en/rebase-backend'	2020-03-02 15:07:19 -08:00
rebase.c	pull --rebase/remote rename: document and honor single-letter abbreviations rebase types	2020-02-10 10:52:10 -08:00
rebase.h	pull --rebase/remote rename: document and honor single-letter abbreviations rebase types	2020-02-10 10:52:10 -08:00
ref-filter.c	Merge branch 'dr/push-remote-ref-update'	2020-03-11 10:58:16 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	Merge branch 'rs/show-progress-in-dumb-http-fetch'	2020-03-09 11:21:21 -07:00
remote-testsvn.c	…
remote.c	remote: drop "explicit" parameter from remote_ref_for_branch()	2020-03-03 14:56:05 -08:00
remote.h	remote: drop "explicit" parameter from remote_ref_for_branch()	2020-03-03 14:56:05 -08:00
replace-object.c	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
replace-object.h	replace-object: make replace operations thread-safe	2020-01-17 13:52:14 -08:00
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	Merge branch 'bc/run-command-nullness-after-free-fix' into maint	2020-02-14 12:42:27 -08:00
run-command.h	run-command.h: fix mis-indented struct member	2020-02-22 09:05:34 -08:00
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'js/rebase-i-with-colliding-hash' into maint	2020-03-17 15:02:21 -07:00
sequencer.h	Merge branch 'en/rebase-backend'	2020-03-02 15:07:19 -08:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	Merge branch 'es/outside-repo-errmsg-hints'	2020-03-16 12:43:29 -07:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	packed_object_info(): use object_id for returning delta base	2020-02-24 12:55:53 -08:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	nth_packed_object_oid(): use customary integer return	2020-02-24 12:55:42 -08:00
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	…
stable-qsort.c	…
strbuf.c	credential: allow wildcard patterns when matching config	2020-02-20 13:05:43 -08:00
strbuf.h	Merge branch 'bc/wildcard-credential'	2020-03-05 10:43:02 -08:00
streaming.c	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
streaming.h	streaming: allow open_istream() to handle any repo	2020-01-31 10:45:39 -08:00
string-list.c	…
string-list.h	Merge branch 'en/string-list-can-be-custom-sorted' into maint	2020-02-14 12:42:27 -08:00
sub-process.c	…
sub-process.h	…
submodule-config.c	Merge branch 'mr/show-config-scope'	2020-02-17 13:22:17 -08:00
submodule-config.h	submodule-config: add skip_if_read option to repo_read_gitmodules()	2020-01-17 13:52:14 -08:00
submodule.c	Merge branch 'dt/submodule-rm-with-stale-cache' into maint	2020-03-17 15:02:21 -07: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.h	…
trailer.c	…
trailer.h	…
transport-helper.c	C: use skip_prefix() to avoid hardcoded string length	2020-01-31 13:03:45 -08:00
transport-internal.h	…
transport.c	Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint	2020-02-14 12:42:28 -08:00
transport.h	…
tree-diff.c	…
tree-walk.c	tree-walk.c: break circular dependency with unpack-trees	2020-02-04 10:32:15 -08:00
tree-walk.h	tree-walk.c: break circular dependency with unpack-trees	2020-02-04 10:32:15 -08:00
tree.c	…
tree.h	…
unicode-width.h	unicode: update the width tables to Unicode 13.0	2020-03-17 15:06:37 -07:00
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint	2020-03-17 15:02:25 -07:00
unpack-trees.h	tree-walk.c: break circular dependency with unpack-trees	2020-02-04 10:32:15 -08:00
upload-pack.c	config: split repo scope to local and worktree	2020-02-10 10:32:20 -08:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	credential: allow wildcard patterns when matching config	2020-02-20 13:05:43 -08:00
urlmatch.h	credential: allow wildcard patterns when matching config	2020-02-20 13:05:43 -08:00
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	Merge branch 'rs/show-progress-in-dumb-http-fetch'	2020-03-09 11:21:21 -07:00
walker.h	remote-curl: show progress for fetches over dumb HTTP	2020-03-03 13:15:40 -08:00
wildmatch.c	…
wildmatch.h	…
worktree.c	Merge branch 'hv/receive-denycurrent-everywhere'	2020-03-05 10:43:03 -08:00
worktree.h	worktree: add utility to find worktree by pathname	2020-02-24 13:04:30 -08:00
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	xdiff: avoid computing non-zero offset from NULL pointer	2020-01-28 23:13:25 -08: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-<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