Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Johannes Schindelin dbe7b41019 t3301: fix false negative
In 6956f858f6 (notes: implement helpers needed for note copying during
rewrite, 2010-03-12), we introduced a test case that verifies that the
config setting `notes.rewriteRef` can be overridden via the environment
variable `GIT_NOTES_REWRITE_REF`.

Back when it was introduced, it relied on a side effect of an earlier
test case that configured `core.noteRef` to point to `refs/notes/other`.

In 908a320363 (t3301: modernize style, 2014-11-12), this side effect was
removed.

The test case *still* passed, but for the wrong reason: we no longer
overrode the rewrite ref, but there simply was nothing to rewrite
anymore, as the overridden notes ref was "modernized" away.

Let's let that test case pass for the correct reason again.

To make sure of that, let's change the idea of the original test case:
it configured `notes.rewriteRef` to point to the actual notes ref,
forced that to be ignored and then verified that the notes were *not*
rewritten.

By turning that idea upside down (configure the `notes.rewriteRef` to
another notes ref, override it via the environment variable to force the
notes to be copied, and then verify that the notes *were* rewritten), we
make it much harder for that test case to pass for the wrong reason.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-04-09 20:10:35 +09:00
.github
block-sha1
builtin Fix typos in translatable strings for v2.21.0 2019-02-11 12:58:06 -08:00
ci ci: clear and mark MAKEFLAGS exported just once 2019-02-07 11:36:28 -08:00
compat mingw: safe-guard a bit more against getenv() problems 2019-02-15 10:25:28 -08:00
contrib Merge branch 'sg/strbuf-addbuf-cocci' 2019-02-05 14:26:18 -08:00
Documentation Merge branch 'yn/checkout-doc-fix' 2019-02-24 07:18:00 -08:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl
po l10n: Fixes to Catalan translation 2019-03-02 19:12:58 +01:00
ppc
refs
sha1collisiondetection@232357eb2e
sha1dc
sha256
t t3301: fix false negative 2019-04-09 20:10:35 +09:00
templates
vcs-svn
xdiff
.clang-format
.editorconfig
.gitattributes
.gitignore Merge branch 'sg/travis-specific-cc' 2019-02-06 22:05:25 -08:00
.gitmodules
.mailmap .mailmap: map Clemens Buchacher's mail addresses 2019-02-08 11:14:15 -08:00
.travis.yml travis-ci: switch to Xcode 10.1 macOS image 2019-01-17 11:14:45 -08:00
.tsan-suppressions
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alias.h
alloc.c object_as_type: initialize commit-graph-related fields of 'struct commit' 2019-01-27 16:55:57 -08:00
alloc.h object_as_type: initialize commit-graph-related fields of 'struct commit' 2019-01-27 16:55:57 -08:00
apply.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'nd/indentation-fix' 2019-01-14 15:29:32 -08:00
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
attr.h
azure-pipelines.yml ci: parallelize testing on Windows 2019-01-29 09:26:47 -08:00
banned.h
base85.c
bisect.c Merge branch 'ds/push-sparse-tree-walk' 2019-02-06 22:05:25 -08:00
bisect.h
blame.c read-cache.c: kill read_index() 2019-01-14 12:13:04 -08:00
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c convert has_sha1_file() callers to has_object_file() 2019-01-08 09:41:06 -08:00
bulk-checkin.h
bundle.c create_bundle(): drop unused "header" parameter 2019-01-24 12:35:44 -08:00
bundle.h create_bundle(): drop unused "header" parameter 2019-01-24 12:35:44 -08:00
cache-tree.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
cache-tree.h cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch 2019-01-24 11:55:06 -08:00
cache.h Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
chdir-notify.c
chdir-notify.h
check_bindir
check-builtins.sh
check-racy.c
checkout.c
checkout.h
color.c
color.h
column.c column: drop unused "opts" parameter in item_length() 2019-01-24 12:35:44 -08:00
column.h
combine-diff.c Merge branch 'jk/diff-cc-stat-fixes' 2019-02-05 14:26:17 -08:00
command-list.txt
commit-graph.c Merge branch 'ab/commit-graph-write-progress' 2019-02-05 14:26:14 -08:00
commit-graph.h Merge branch 'ab/commit-graph-write-progress' 2019-02-05 14:26:14 -08:00
commit-reach.c Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
commit-reach.h Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
commit.h Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
common-main.c
config.c config: drop unused parameter from maybe_remove_section() 2019-01-24 12:35:44 -08:00
config.h
config.mak.dev Merge branch 'jk/dev-build-format-security' 2019-01-18 13:49:55 -08:00
config.mak.in
config.mak.uname mingw: allow building with an MSYS2 runtime v3.x 2019-03-11 11:02:16 +09:00
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c Merge branch 'jk/unused-parameter-cleanup' 2019-02-06 22:05:23 -08:00
convert.h
copy.c
COPYING
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 Merge branch 'lt/date-human' 2019-02-06 22:05:24 -08:00
decorate.c
decorate.h
delta-islands.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jk/diff-cc-stat-fixes' 2019-02-05 14:26:17 -08:00
diff.h Merge branch 'sb/diff-color-moved-config-option-fixup' 2019-01-14 15:29:31 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'nd/the-index' into md/list-objects-filter-by-depth 2019-01-15 15:38:29 -08:00
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
dir.h
editor.c
entry.c Merge branch 'nd/checkout-noisy' 2019-01-14 15:29:29 -08:00
environment.c Merge branch 'jk/save-getenv-result' 2019-01-29 12:47:54 -08:00
exec-cmd.c
exec-cmd.h
fast-import.c
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c Merge branch 'bc/fetch-pack-clear-alternate-shallow' 2019-02-06 22:05:30 -08:00
fetch-pack.h
fmt-merge-msg.h
fsck.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
fsck.h
fsmonitor.c
fsmonitor.h
fuzz-commit-graph.c fuzz-commit-graph: initialize repo object 2019-02-07 13:02:26 -08:00
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 Merge branch 'nd/fileno-may-be-macro' 2019-02-13 18:18:41 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh git-instaweb: add Python builtin http.server support 2019-01-28 10:57:44 -08:00
git-legacy-rebase.sh Merge branch 'js/rebase-i-redo-exec-fix' 2019-02-08 20:44:52 -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 Merge branch 'ld/git-p4-shelve-update-fix' 2019-02-05 14:26:10 -08:00
git-parse-remote.sh
git-quiltimport.sh git-quiltimport: add --keep-non-patch option 2019-01-07 15:29:34 -08:00
git-rebase--am.sh
git-rebase--common.sh Merge branch 'en/rebase-merge-on-sequencer' 2019-02-06 22:05:20 -08:00
git-rebase--preserve-merges.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 'sh/submodule-summary-abbrev-fix' 2019-02-06 22:05:27 -08:00
git-svn.perl
GIT-VERSION-GEN Git 2.21 2019-02-24 07:55:19 -08:00
git-web--browse.sh
git.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'nd/the-index' into md/list-objects-filter-by-depth 2019-01-15 15:38:29 -08:00
grep.h
hash.h
hashmap.c
hashmap.h
help.c help: align the longest command in the command listing 2019-01-31 15:27:35 -08:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
http-walker.c convert has_sha1_file() callers to has_object_file() 2019-01-08 09:41:06 -08:00
http.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
http.h Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
ident.c
imap-send.c Merge branch 'nd/imap-send-typofix' 2019-02-12 09:00:25 -08:00
INSTALL
interdiff.c
interdiff.h
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 Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
list-objects-filter-options.h filter-options: expand scaled numbers 2019-01-15 15:42:31 -08:00
list-objects-filter.c tree:<depth>: skip some trees even when collecting omits 2019-01-15 15:39:34 -08:00
list-objects-filter.h
list-objects.c Merge branch 'ds/push-sparse-tree-walk' 2019-02-06 22:05:25 -08:00
list-objects.h list-objects: consume sparse tree walk 2019-01-17 13:44:39 -08:00
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c log: add %S option (like --source) to log --format 2019-01-11 10:28:11 -08:00
log-tree.h
ls-refs.c Merge branch 'jt/namespaced-ls-refs-fix' 2019-02-05 14:26:15 -08:00
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
Makefile tests: teach the test-tool to generate NUL bytes and use it 2019-02-19 10:22:21 -08:00
match-trees.c Merge branch 'jk/unused-parameter-cleanup' 2019-02-06 22:05:23 -08:00
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
merge-recursive.h merge-recursive.c: remove implicit dependency on the_index 2019-01-14 12:13:04 -08:00
merge.c read-cache.c: kill read_index() 2019-01-14 12:13:04 -08:00
mergesort.c
mergesort.h
midx.c
midx.h
name-hash.c cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch 2019-01-24 11:55:06 -08:00
notes-cache.c
notes-cache.h
notes-merge.c notes-utils.c: remove the_repository references 2019-01-14 12:13:04 -08:00
notes-merge.h
notes-utils.c notes-utils.c: remove the_repository references 2019-01-14 12:13:04 -08:00
notes-utils.h notes-utils.c: remove the_repository references 2019-01-14 12:13:04 -08:00
notes.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
notes.h
object-store.h Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
object.c object: fix leak of shallow_stat 2019-02-07 13:02:28 -08:00
object.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c Merge branch 'ph/pack-objects-mutex-fix' 2019-02-05 14:26:16 -08:00
pack-objects.h Merge branch 'ph/pack-objects-mutex-fix' 2019-02-05 14:26:16 -08:00
pack-revindex.c various: tighten constness of some local variables 2019-02-04 09:57:10 -08:00
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
packfile.h Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
pager.c
parse-options-cb.c
parse-options.c Merge branch 'nd/indentation-fix' 2019-01-14 15:29:32 -08:00
parse-options.h Merge branch 'nd/indentation-fix' 2019-01-14 15:29:32 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
pathspec.h
pkt-line.c {fetch,upload}-pack: sideband v2 fetch response 2019-01-17 11:25:07 -08:00
pkt-line.h {fetch,upload}-pack: sideband v2 fetch response 2019-01-17 11:25:07 -08:00
preload-index.c read-cache.c: kill read_index() 2019-01-14 12:13:04 -08:00
pretty.c Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
pretty.h Merge branch 'sb/more-repo-in-api' 2019-02-05 14:26:09 -08:00
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
range-diff.h
reachable.c
reachable.h
read-cache.c Merge branch 'jk/add-ignore-errors-bit-assignment-fix' 2019-02-06 22:05:31 -08:00
README.md README: adjust for final Azure Pipeline ID 2019-02-23 21:27:04 -08:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c Merge branch 'ot/ref-filter-object-info' 2019-01-18 13:49:56 -08:00
ref-filter.h
reflog-walk.c Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
reflog-walk.h
refs.c convert has_sha1_file() callers to has_object_file() 2019-01-08 09:41:06 -08:00
refs.h
refspec.c
refspec.h
RelNotes
remote-curl.c remote-curl: tighten "version 2" check for smart-http 2019-02-06 12:20:22 -08:00
remote-testsvn.c
remote.c Merge branch 'jk/remote-insteadof-cleanup' 2019-01-29 12:47:55 -08:00
remote.h
replace-object.c
replace-object.h
repository.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
repository.h Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
rerere.c read-cache.c: kill read_index() 2019-01-14 12:13:04 -08:00
rerere.h
resolve-undo.c resolve-undo.c: use the right index instead of the_index 2018-08-13 14:14:44 -07:00
resolve-undo.h
revision.c Merge branch 'ds/push-sparse-tree-walk' 2019-02-06 22:05:25 -08:00
revision.h Merge branch 'ds/push-sparse-tree-walk' 2019-02-06 22:05:25 -08:00
run-command.c
run-command.h
send-pack.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
send-pack.h
sequencer.c Merge branch 'rj/sequencer-sign-off-header-static' 2019-02-13 18:18:41 -08:00
sequencer.h Merge branch 'rj/sequencer-sign-off-header-static' 2019-02-13 18:18:41 -08:00
serve.c
serve.h
server-info.c
setup.c Merge branch 'js/abspath-part-inside-repo' 2019-02-05 14:26:15 -08:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c get_oid_with_context(): match prototype and implementation 2019-02-12 10:14:56 -08:00
sha1dc_git.c
sha1dc_git.h
shallow.c fetch-pack: do not take shallow lock unnecessarily 2019-01-10 14:53:35 -08:00
shell.c
shortlog.h
sideband.c Merge branch 'jt/fetch-v2-sideband' 2019-02-05 14:26:11 -08:00
sideband.h {fetch,upload}-pack: sideband v2 fetch response 2019-01-17 11:25:07 -08:00
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c
strbuf.h
streaming.c Merge branch 'jk/loose-object-cache-oid' 2019-02-06 22:05:27 -08:00
streaming.h
string-list.c
string-list.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08: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
trailer.c
trailer.h
transport-helper.c Merge branch 'js/filter-options-should-use-plain-int' 2019-02-05 14:26:10 -08:00
transport-internal.h
transport.c Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband 2019-01-14 11:16:04 -08:00
transport.h
tree-diff.c Merge branch 'bc/tree-walk-oid' 2019-01-29 12:47:56 -08:00
tree-walk.c Merge branch 'dt/cat-file-batch-ambiguous' 2019-02-06 22:05:21 -08:00
tree-walk.h Merge branch 'dt/cat-file-batch-ambiguous' 2019-02-06 22:05:21 -08:00
tree.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'nd/the-index-final' 2019-02-06 22:05:23 -08:00
unpack-trees.h
upload-pack.c Merge branch 'jt/fetch-v2-sideband' 2019-02-05 14:26:11 -08:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c Merge branch 'nd/style-opening-brace' 2019-01-18 13:49:52 -08:00
userdiff.h
utf8.c utf8: handle systems that don't write BOM for UTF-16 2019-02-11 18:20:07 -08:00
utf8.h Support working-tree-encoding "UTF-16LE-BOM" 2019-01-31 10:27:52 -08:00
varint.c
varint.h cleanups: ensure that git-compat-util.h is included first 2014-09-15 12:05:14 -07:00
version.c
version.h
versioncmp.c
walker.c tree-walk: store object_id in a separate member 2019-01-15 09:57:41 -08:00
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'nd/the-index' into md/list-objects-filter-by-depth 2019-01-15 15:38:29 -08: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-.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