Go to file

Junio C Hamano 91e07058c5 update-index: do not read HEAD and MERGE_HEAD unconditionally When "update-index --unresolve $path" cannot find the resolve-undo record for the path the user requested to unresolve, it stuffs the blobs from HEAD and MERGE_HEAD to stage #2 and stage #3 as a fallback. For this reason, the operation does not even start unless both "HEAD" and "MERGE_HEAD" exist. This is suboptimal in a few ways: * It does not recreate stage #1. Even though it is a correct design decision not to do so (because it is impossible to recreate in general cases, without knowing how we got there, including what merge strategy was used), it is much less useful not to have that information in the index. * It limits the "unresolve" operation only during a conflicted "git merge" and nothing else. Other operations like "rebase", "cherry-pick", and "switch -m" may result in conflicts, and the user may want to unresolve the conflict that they incorrectly resolved in order to redo the resolution, but the fallback would not kick in. * Most importantly, the entire "unresolve" operation is disabled after a conflicted merge is committed and MERGE_HEAD is removed, even though the index has perfectly usable resolve-undo records. By lazily reading the HEAD and MERGE_HEAD only when we need to go to the fallback codepath, we will allow cases where resolve-undo records are available (which is 100% of the time, unless the user is reading from an index file created by Git more than 10 years ago) to proceed even after a conflicted merge was committed, during other mergy operations that do not use MERGE_HEAD, or after the result of such mergy operations has been committed. Signed-off-by: Junio C Hamano <gitster@pobox.com>		2023-07-31 15:46:17 -07:00
.github	…
Documentation	Git 2.41-rc2	2023-05-25 05:55:19 +09:00
block-sha1	…
builtin	update-index: do not read HEAD and MERGE_HEAD unconditionally	2023-07-31 15:46:17 -07:00
ci	…
compat	…
contrib	Merge branch 'sg/retire-unused-cocci'	2023-05-15 13:59:06 -07:00
ewah	…
git-gui	…
gitk-git	Merge gitk changes into js/gitk-fixes-from-gfw	2023-05-08 09:16:57 -07:00
gitweb	…
mergetools	…
negotiator	Merge branch 'hx/negotiator-non-recursive'	2023-05-10 10:23:28 -07:00
oss-fuzz	…
perl	…
po	l10n: zh_TW.po: Git 2.41.0	2023-06-01 00:53:09 +08:00
refs	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
reftable	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	update-index: do not read HEAD and MERGE_HEAD unconditionally	2023-07-31 15:46:17 -07:00
templates	…
trace2	…
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.41	2023-06-01 15:28:26 +09:00
INSTALL	…
LGPL-2.1	…
Makefile	…
README.md	…
RelNotes	…
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	…
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
archive.h	…
attr.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
attr.h	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -07:00
banned.h	…
base85.c	…
base85.h	…
bisect.c	…
bisect.h	…
blame.c	Merge branch 'jk/blame-fake-commit-label'	2023-05-02 10:13:35 -07:00
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	Merge branch 'rj/branch-unborn-in-other-worktrees'	2023-05-15 13:59:03 -07:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle-uri.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
bundle-uri.h	…
bundle.c	…
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	…
cbtree.c	…
cbtree.h	…
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
checkout.c	…
checkout.h	…
chunk-format.c	…
chunk-format.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
commit.h	…
common-main.c	…
config.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
config.h	…
config.mak.dev	…
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
connected.h	…
convert.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
convert.h	…
copy.c	…
copy.h	…
credential.c	Merge branch 'mh/credential-oauth-refresh-token'	2023-05-10 10:23:29 -07:00
credential.h	Merge branch 'mh/credential-oauth-refresh-token'	2023-05-10 10:23:29 -07:00
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
date.h	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diagnose.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
diagnose.h	…
diff-delta.c	…
diff-lib.c	…
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	Merge branch 'jc/dirstat-plug-leaks'	2023-05-15 13:59:05 -07:00
diff.h	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore-rotate.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	…
dir.h	…
editor.c	…
editor.h	…
entry.c	…
entry.h	…
environment.c	…
environment.h	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -07:00
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor--daemon.h	…
fsmonitor-ipc.c	…
fsmonitor-ipc.h	…
fsmonitor-path-utils.h	…
fsmonitor-settings.c	…
fsmonitor-settings.h	…
fsmonitor.c	…
fsmonitor.h	…
generate-cmdlist.sh	…
generate-configlist.sh	…
generate-hooklist.sh	…
gettext.c	…
gettext.h	…
git-archimport.perl	…
git-compat-util.h	…
git-curl-compat.h	…
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-quiltimport.sh	…
git-request-pull.sh	…
git-send-email.perl	Merge branch 'jc/send-email-pre-process-fix'	2023-05-19 09:27:06 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git-zlib.c	…
git-zlib.h	…
git.c	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -07:00
git.rc	…
gpg-interface.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
grep.h	…
hash-ll.h	…
hash-lookup.c	…
hash-lookup.h	…
hash.h	…
hashmap.c	…
hashmap.h	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
help.c	…
help.h	…
hex.c	…
hex.h	…
hook.c	…
hook.h	…
http-backend.c	…
http-fetch.c	…
http-push.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
http-walker.c	…
http.c	Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.41	2023-06-24 15:04:48 -07:00
http.h	…
ident.c	…
ident.h	…
imap-send.c	imap-send: include strbuf.h	2023-05-17 09:54:07 -07: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.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
match-trees.h	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-ort-wrappers.c	…
merge-ort-wrappers.h	…
merge-ort.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
merge-ort.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.h	…
midx.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
midx.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	Merge branch 'tb/ban-strtok'	2023-05-02 10:13:35 -07:00
notes.h	…
object-file.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
object-file.h	…
object-name.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
object-name.h	…
object-store.h	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
object.c	…
object.h	…
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
oidtree.c	…
oidtree.h	…
pack-bitmap-write.c	…
pack-bitmap.c	fsck: verify checksums of all .bitmap files	2023-05-02 08:48:22 -07:00
pack-bitmap.h	fsck: verify checksums of all .bitmap files	2023-05-02 08:48:22 -07:00
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
packfile.h	…
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
pathspec.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
pathspec.h	…
pkt-line.c	…
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-caps.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
protocol-caps.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	…
reflog.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	…
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
run-command.c	Merge branch 'tb/run-command-needs-alloc-h'	2023-05-19 09:27:06 -07:00
run-command.h	…
scalar.c	…
send-pack.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
send-pack.h	…
sequencer.c	Merge branch 'js/rebase-count-fixes'	2023-05-20 05:35:57 +09:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
server-info.h	…
setup.c	…
setup.h	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shared.mak	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	…
sparse-index.c	…
sparse-index.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
statinfo.h	…
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	…
symlinks.h	…
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	…
transport-internal.h	…
transport.c	…
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	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
unpack-trees.h	…
upload-pack.c	upload-pack: advertise capabilities when cloning empty repos	2023-05-17 13:22:46 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	attr: teach "--attr-source=<tree>" global option to "git"	2023-05-06 14:34:09 -07:00
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	Merge branch 'en/header-split-cache-h-part-2'	2023-05-09 16:45:46 -07:00
versioncmp.h	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	…
wrapper.h	…
write-or-die.c	…
write-or-die.h	…
ws.c	Merge branch 'jc/attr-source-tree'	2023-05-17 10:11:41 -07:00
ws.h	…
wt-status.c	…
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…

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 and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). 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