Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Elijah Newren e4cdfe84a0 merge: abort if index does not match HEAD for trivial merges
As noted in the last commit and the links therein (especially commit
9822175d2b ("Ensure index matches head before invoking merge machinery,
round N", 2019-08-17), we have had a very long history of problems with
failing to enforce the requirement that index matches HEAD when starting
a merge.

The "trivial merge" logic in builtin/merge.c is yet another such case
we previously missed.  Add a check for it to ensure it aborts if the
index does not match HEAD, and add a testcase where this fix is needed.

Note that the fix here would also incidentally be an alternative fix
for the testcase added in the last patch, but the fix in the last patch
is still needed when multiple merge strategies are in use, so tweak the
testcase from the previous commit so that it continues to exercise the
codepath added in the last commit.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-22 21:45:23 -07:00
.github ci(github): bring back the 'print test failures' step 2022-06-08 16:12:37 -07:00
block-sha1
builtin merge: abort if index does not match HEAD for trivial merges 2022-07-22 21:45:23 -07:00
ci Merge branch 'js/ci-github-workflow-markup' 2022-06-17 10:33:32 -07:00
compat Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
contrib Merge branch 'rs/cocci-array-copy' 2022-07-19 16:40:18 -07:00
Documentation The fifth batch 2022-07-19 16:40:19 -07:00
ewah Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
git-gui
gitk-git
gitweb Merge branch 'ab/build-gitweb' 2022-07-18 13:31:55 -07:00
mergetools vimdiff: make layout engine more robust against user vim settings 2022-07-08 13:15:50 -07:00
negotiator
perl
po l10n: sv.po: Update Swedish translation (5367t0f0u) 2022-06-26 20:38:46 +08:00
ppc
refs Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
reftable Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256 sha256: add support for Nettle 2022-07-10 14:43:34 -07:00
t merge: abort if index does not match HEAD for trivial merges 2022-07-22 21:45:23 -07:00
templates fsmonitor: query watchman with right valid json 2022-06-07 10:00:49 -07:00
trace2
xdiff Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
.cirrus.yml ci: update Cirrus-CI image to FreeBSD 12.3 2022-05-25 08:47:11 -07:00
.clang-format
.editorconfig
.gitattributes
.gitignore Makefile & .gitignore: ignore & clean "git.res", not "*.res" 2022-07-06 12:24:43 -07:00
.gitmodules
.mailmap
.tsan-suppressions
abspath.c
aclocal.m4
add-interactive.c Merge 'js/add-i-delete' into maint-2.37 2022-07-04 13:40:59 -07:00
add-interactive.h
add-patch.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
apply.h
archive-tar.c archive-tar: use internal gzip by default 2022-06-15 13:19:47 -07:00
archive-zip.c
archive.c archive --add-virtual-file: allow paths containing colons 2022-05-30 23:07:31 -07:00
archive.h archive: rename archiver data field to filter_command 2022-06-15 13:19:46 -07:00
attr.c
attr.h
banned.h
base85.c
bisect.c
bisect.h
blame.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c Merge branch 'ds/branch-checked-out' 2022-07-11 15:38:51 -07:00
branch.h Merge branch 'ds/branch-checked-out' 2022-07-11 15:38:51 -07:00
builtin.h
bulk-checkin.c Merge branch 'tb/cruft-packs' 2022-06-03 14:30:37 -07:00
bulk-checkin.h
bundle.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
bundle.h bundle.h: make "fd" version of read_bundle_header() public 2022-05-16 15:02:10 -07:00
cache-tree.c cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache-tree.h cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache.h Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c
checkout.h
chunk-format.c chunk-format.h: extract oid_version() 2022-05-26 15:48:26 -07:00
chunk-format.h chunk-format.h: extract oid_version() 2022-05-26 15:48:26 -07:00
CODE_OF_CONDUCT.md
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'rs/combine-diff-with-incompatible-options' 2022-07-11 15:38:48 -07:00
command-list.txt
commit-graph.c Merge branch 'hx/lookup-commit-in-graph-fix' 2022-07-19 16:40:16 -07:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
commit.h
common-main.c usage.c: add a non-fatal bug() function to go with BUG() 2022-06-02 12:51:35 -07:00
config.c Merge branch 'ns/batch-fsync' 2022-06-03 14:30:34 -07:00
config.h
config.mak.dev Revert -Wno-error=dangling-pointer 2022-06-01 08:49:13 -07:00
config.mak.in
config.mak.uname Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
configure.ac
connect.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
connect.h
connected.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
connected.h
convert.c
convert.h
copy.c
COPYING
credential.c
credential.h
csum-file.c core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
csum-file.h
ctype.c
daemon.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
date.c
date.h
decorate.c
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 Merge branch 'ab/cocci-unused' 2022-07-18 13:31:57 -07:00
diff.h
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 Merge branch 'gg/worktree-from-the-above' 2022-07-14 15:03:58 -07:00
dir.h dir API: add a generalized path_match_flags() function 2022-05-16 15:02:09 -07:00
editor.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
entry.c
entry.h
environment.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
environment.h
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'ds/bundle-uri' 2022-06-03 14:30:34 -07:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c dir API: add a generalized path_match_flags() function 2022-05-16 15:02:09 -07:00
fsck.h
fsmonitor--daemon.h fsmonitor--daemon: stub in health thread 2022-05-26 15:59:27 -07:00
fsmonitor-ipc.c
fsmonitor-ipc.h
fsmonitor-settings.c fsmonitor: avoid memory leak in fsm_settings__get_incompatible_msg() 2022-06-16 13:22:03 -07:00
fsmonitor-settings.h fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible 2022-05-26 15:59:26 -07:00
fsmonitor.c fsmonitor: never set CE_FSMONITOR_VALID on submodules 2022-05-26 15:59:27 -07:00
fsmonitor.h fsmonitor: never set CE_FSMONITOR_VALID on submodules 2022-05-26 15:59:27 -07:00
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Sync with 2.35.4 2022-06-23 12:36:12 +02:00
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-sh-setup.sh: remove "say" function, change last users 2022-06-28 13:13:18 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh merge-resolve: abort if index does not match HEAD 2022-07-22 21:45:22 -07:00
git-mergetool--lib.sh vimdiff: add tool documentation 2022-04-03 15:09:52 -07:00
git-mergetool.sh
git-p4.py Merge branch 'tk/p4-metadata-coding-strategies' 2022-05-20 15:27:00 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh git-sh-setup.sh: remove "say" function, change last users 2022-06-28 13:13:18 -07:00
git-submodule.sh git-submodule.sh: use "$quiet", not "$GIT_QUIET" 2022-06-28 13:13:18 -07:00
git-svn.perl
GIT-VERSION-GEN Git 2.37.1 2022-07-04 13:45:08 -07:00
git-web--browse.sh
git.c merge-tree: add option parsing and initial shell for real merge function 2022-06-22 16:10:05 -07:00
git.rc
gpg-interface.c gpg-interface: add function for converting trust level to string 2022-07-10 22:10:23 -07:00
gpg-interface.h gpg-interface: add function for converting trust level to string 2022-07-10 22:10:23 -07:00
graph.c
graph.h
grep.c grep: add --max-count command line option 2022-06-22 13:23:29 -07:00
grep.h grep: add --max-count command line option 2022-06-22 13:23:29 -07:00
hash-lookup.c
hash-lookup.h
hash.h sha256: add support for Nettle 2022-07-10 14:43:34 -07:00
hashmap.c
hashmap.h
help.c
help.h
hex.c
hook.c Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
hook.h
http-backend.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
http-fetch.c
http-push.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
http-walker.c
http.c Merge branch 'll/curl-accept-language' 2022-07-19 16:40:19 -07:00
http.h remote-curl: send Accept-Language header to server 2022-07-11 12:24:28 -07:00
ident.c
imap-send.c
INSTALL
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
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 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
mailmap.h
Makefile Merge branch 'bc/nettle-sha256' 2022-07-18 13:31:58 -07:00
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c merge-ort-wrappers: make printed message match the one from recursive 2022-07-22 21:45:22 -07:00
merge-ort-wrappers.h
merge-ort.c Merge branch 'en/merge-dual-dir-renames-fix' 2022-07-18 13:31:56 -07:00
merge-ort.h merge-ort: optionally produce machine-readable output 2022-06-22 16:10:06 -07:00
merge-recursive.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -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
notes.h
object-file.c Merge branch 'hx/unpack-streaming' 2022-07-14 15:03:59 -07:00
object-name.c
object-store.h object-file.c: add "stream_loose_object()" to handle large object 2022-06-13 10:22:35 -07:00
object.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
pack-bitmap.c Merge branch 'tb/midx-race-in-pack-objects' 2022-06-03 14:30:35 -07:00
pack-bitmap.h
pack-check.c
pack-mtimes.c pack-mtimes: avoid closing a bogus file descriptor 2022-06-16 13:22:03 -07:00
pack-mtimes.h pack-mtimes: support reading .mtimes files 2022-05-26 15:48:26 -07:00
pack-objects.c pack-mtimes: support writing pack .mtimes files 2022-05-26 15:48:26 -07:00
pack-objects.h pack-objects.h: remove outdated pahole results 2022-06-28 15:39:03 -07:00
pack-revindex.c
pack-revindex.h
pack-write.c pack-write: drop always-NULL parameter 2022-06-16 11:59:55 -07:00
pack.h pack-mtimes: support writing pack .mtimes files 2022-05-26 15:48:26 -07:00
packfile.c Merge branch 'jk/optim-promisor-object-enumeration' 2022-07-11 15:38:50 -07:00
packfile.h
pager.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c parse-options.c: use optbug() instead of BUG() "opts" check 2022-06-02 12:51:35 -07:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'ds/bundle-uri' 2022-06-03 14:30:34 -07:00
path.h
pathspec.c Merge branch 'jc/all-negative-pathspec' 2022-06-07 14:10:59 -07:00
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c gpg-interface: add function for converting trust level to string 2022-07-10 22:10:23 -07:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
promisor-remote.h
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
quote.c
quote.h
range-diff.c Merge branch 'pb/range-diff-with-submodule' 2022-06-13 15:53:41 -07:00
range-diff.h
reachable.c reachable: report precise timestamps from objects in cruft packs 2022-05-26 15:48:26 -07:00
reachable.h builtin/pack-objects.c: --cruft with expiration 2022-05-26 15:48:26 -07:00
read-cache.c read_index_from(): avoid memory leak 2022-06-16 13:22:03 -07:00
README.md
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c ref-filter: disable save_commit_buffer while traversing 2022-07-11 14:27:31 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c
refs.h
refspec.c
refspec.h
RelNotes Git 2.37.1 2022-07-04 13:45:08 -07:00
remote-curl.c remote-curl: send Accept-Language header to server 2022-07-11 12:24:28 -07:00
remote.c Merge branch 'jk/remote-show-with-negative-refspecs' 2022-07-13 14:54:54 -07:00
remote.h remote: handle negative refspecs in git remote show 2022-06-17 10:03:59 -07:00
replace-object.c
replace-object.h
repo-settings.c
repository.c
repository.h
rerere.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
rerere.h
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/resolve-undo' 2022-07-19 16:40:16 -07:00
revision.h Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
run-command.c Merge branch 'js/wait-or-whine-can-fail' 2022-06-13 15:53:44 -07:00
run-command.h Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
SECURITY.md
send-pack.c send-pack.c: add config push.useBitmaps 2022-06-17 14:31:01 -07:00
send-pack.h send-pack.c: add config push.useBitmaps 2022-06-17 14:31:01 -07:00
sequencer.c Merge branch 'jc/revert-show-parent-info' 2022-06-15 15:09:27 -07:00
sequencer.h revert: optionally refer to commit in the "reference" format 2022-05-26 23:05:03 -07:00
serve.c
serve.h
server-info.c
setup.c Git 2.37.1 2022-07-11 16:08:49 -07:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'jt/unparse-commit-upon-graft-change' 2022-06-13 15:53:42 -07:00
shallow.h
shared.mak cocci: add a "coccicheck-test" target and test *.cocci rules 2022-07-06 12:24:43 -07:00
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
simple-ipc.h
sparse-index.c Merge branch 'ds/sparse-sparse-checkout' 2022-06-03 14:30:35 -07:00
sparse-index.h Merge branch 'ds/sparse-sparse-checkout' 2022-06-03 14:30:35 -07:00
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.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
submodule-config.h Merge branch 'pb/submodule-recurse-mode-enum' 2022-05-20 15:26:53 -07:00
submodule.c Merge branch 'ab/leakfix' 2022-07-18 13:31:54 -07:00
submodule.h Merge branch 'ab/env-array' 2022-06-10 15:04:13 -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
trace2.c common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trace2.h common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trace.c
trace.h
trailer.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
trailer.h
transport-helper.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
transport-internal.h
transport.c Merge branch 'fh/transport-push-leakfix' 2022-06-07 14:10:57 -07: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
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
unpack-trees.h
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c i18n: mark message helpers prefix for translation 2022-06-21 10:06:54 -07: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 Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
write-or-die.c
ws.c
wt-status.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

Build status

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