Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Jeff King aaaa881822 upload-pack: fix broken if/else chain in config callback
The upload_pack_config() callback uses an if/else chain
like:

  if (!strcmp(var, "a"))
     ...
  else if (!strcmp(var, "b"))
     ...
  etc

This works as long as the conditions are mutually exclusive,
but one of them is not. 20b20a22f8 (upload-pack: provide a
hook for running pack-objects, 2016-05-18) added:

  else if (current_config_scope() != CONFIG_SCOPE_REPO) {
     ... check some more options ...
  }

That was fine in that commit, because it came at the end of
the chain.  But later, 10ac85c785 (upload-pack: add object
filtering for partial clone, 2017-12-08) did this:

  else if (current_config_scope() != CONFIG_SCOPE_REPO) {
     ... check some more options ...
  } else if (!strcmp("uploadpack.allowfilter", var))
     ...

We'd always check the scope condition first, meaning we'd
_only_ respect allowfilter when it's in the repo config. You
can see this with:

  git -c uploadpack.allowfilter=true upload-pack . | head -1

which will not advertise the filter capability (but will
after this patch). We never noticed because:

  - our tests always set it in the repo config

  - in protocol v2, we use a different code path that
    actually calls repo_config_get_bool() separately, so
    that _does_ work. Real-world people experimenting with
    this may be using v2.

The more recent uploadpack.allowrefinwant option is in the
same boat.

There are a few possible fixes:

  1. Bump the scope conditional back to the bottom of the
     chain. But that just means somebody else is likely to
     make the same mistake later.

  2. Make the conditional more like the others. I.e.:

       else if (!current_config_scope() != CONFIG_SCOPE_REPO &&
                !strcmp(var, "uploadpack.notallowedinrepo"))

     This works, but the idea of the original structure was
     that we may grow multiple sensitive options like this.

  3. Pull it out of the chain entirely. The chain mostly
     serves to avoid extra strcmp() calls after we've found
     a match. But it's not worth caring about those. In the
     worst case, when there isn't a match, we're already
     hitting every strcmp (and this happens regularly for
     stuff like "core.bare", etc).

This patch does (3).

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-10-26 10:30:59 +09:00
.github
block-sha1
builtin Sync with 2.17.2 2018-09-27 11:45:01 -07:00
ci Merge branch 'nd/travis-gcc-8' 2018-05-30 14:04:08 +09:00
compat
contrib Merge branch 'ab/cred-netrc-no-autodie' 2018-06-18 10:18:42 -07:00
Documentation Git 2.18.1 2018-09-27 11:48:19 -07:00
ewah ewah_read_mmap: bounds-check mmap reads 2018-06-18 09:13:57 -07:00
git-gui
gitk-git
gitweb
mergetools
perl
po l10n: ko.po: Update Korean translation 2018-06-19 02:19:42 +09:00
ppc
refs Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
sha1collisiondetection@19d97bf5af
sha1dc
t Sync with 2.17.2 2018-09-27 11:45:01 -07:00
templates
vcs-svn
xdiff
.clang-format
.gitattributes
.gitignore Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
.gitmodules
.mailmap
.travis.yml
.tsan-suppressions
abspath.c
aclocal.m4
advice.c Merge branch 'js/deprecate-grafts' 2018-05-23 14:38:17 +09:00
advice.h
alias.c
alias.h
alloc.c
apply.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
apply.h
archive-tar.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
archive-zip.c
archive.c Use OPT_SET_INT_F() for cmdline option specification 2018-05-24 16:12:29 +09:00
archive.h
argv-array.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
argv-array.h Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
attr.c
attr.h
base85.c
bisect.c
bisect.h
blame.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
bulk-checkin.h
bundle.c Merge branch 'ma/lockfile-cleanup' 2018-05-30 14:04:05 +09:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
chdir-notify.c
chdir-notify.h
check_bindir
check-builtins.sh
check-racy.c
checkout.c
checkout.h
color.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
color.h
column.c
column.h
combine-diff.c
command-list.txt Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
commit-graph.c Merge branch 'sb/oid-object-info' 2018-05-23 14:38:16 +09:00
commit-graph.h
commit-slab.h
commit.c Merge branch 'jk/index-pack-maint' 2018-06-13 12:50:46 -07:00
commit.h Merge branch 'nd/pack-struct-commit' 2018-05-30 14:04:08 +09:00
common-main.c
config.c Merge branch 'ma/config-store-data-clear' 2018-05-30 21:51:28 +09:00
config.h
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'nd/repack-keep-pack' 2018-05-23 14:38:14 +09:00
configure.ac
connect.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
connect.h
connected.c
connected.h
convert.c
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
decorate.c
decorate.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'jk/ewah-bounds-check' 2018-06-18 11:23:22 -07:00
dir.h Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
editor.c
entry.c
environment.c
exec-cmd.c
exec-cmd.h
fast-import.c Merge branch 'ma/lockfile-cleanup' 2018-05-30 14:04:05 +09:00
fetch-object.c
fetch-object.h
fetch-pack.c Merge branch 'jt/partial-clone-proto-v2' 2018-05-30 14:04:10 +09:00
fetch-pack.h
fmt-merge-msg.h
fsck.c Sync with 2.17.2 2018-09-27 11:45:01 -07:00
fsck.h
fsmonitor.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
fsmonitor.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09: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 Merge branch 'ld/git-p4-updates' 2018-06-18 10:18:41 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'js/rebase-recreate-merge' 2018-06-01 15:06:40 +09:00
git-rebase--merge.sh
git-rebase.sh
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'dd/send-email-reedit' 2018-05-30 14:04:03 +09:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'sb/submodule-update-try-harder' 2018-05-30 14:04:12 +09:00
git-svn.perl
GIT-VERSION-GEN Git 2.18.1 2018-09-27 11:48:19 -07:00
git-web--browse.sh
git.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'ma/regex-no-regfree-after-comp-fail' 2018-05-30 21:51:28 +09:00
grep.h
hash.h
hashmap.c
hashmap.h
help.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Merge branch 'bw/ref-prefix-for-configured-refspec' 2018-05-30 21:51:26 +09:00
http-walker.c
http.c Merge branch 'bw/remote-curl-compressed-responses' 2018-05-30 21:51:29 +09:00
http.h Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
ident.c
imap-send.c
INSTALL
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c Merge branch 'ds/lazy-load-trees' 2018-05-23 14:38:13 +09:00
line-log.h
line-range.c
line-range.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c Merge branch 'sb/oid-object-info' 2018-05-23 14:38:16 +09:00
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 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'es/make-no-iconv' 2018-06-18 11:23:24 -07:00
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'en/rename-directory-detection' 2018-06-18 10:18:44 -07:00
merge-recursive.h
merge.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-store.h Merge branch 'nd/pack-objects-pack-struct' 2018-05-23 14:38:19 +09:00
object.c Merge branch 'sb/oid-object-info' 2018-05-23 14:38:16 +09:00
object.h Merge branch 'nd/pack-objects-pack-struct' 2018-05-23 14:38:19 +09:00
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
pack-bitmap.c Merge branch 'jk/ewah-bounds-check' 2018-06-18 11:23:22 -07:00
pack-bitmap.h
pack-check.c
pack-objects.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
pack-objects.h Merge branch 'nd/pack-objects-pack-struct' 2018-05-23 14:38:19 +09:00
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'jl/zlib-restore-nul-termination' 2018-06-18 10:18:43 -07:00
packfile.h Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
pager.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c Sync with Git 2.17.1 2018-05-29 17:10:05 +09:00
path.h
pathspec.c
pathspec.h
pkt-line.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
pkt-line.h
preload-index.c
pretty.c Merge branch 'ds/lazy-load-trees' 2018-05-23 14:38:13 +09: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
reachable.c
reachable.h
read-cache.c Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
README.md note git-security@googlegroups.com in more places 2018-06-01 09:24:11 +09:00
ref-filter.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
refs.h
refspec.c Merge branch 'bw/refspec-api' 2018-06-04 21:39:50 +09:00
refspec.h fetch: do not pass ref-prefixes for fetch by exact SHA1 2018-06-01 15:15:22 +09:00
RelNotes Git 2.18.1 2018-09-27 11:48:19 -07:00
remote-curl.c remote-curl: accept compressed responses with protocol v2 2018-05-23 10:24:13 +09:00
remote-testsvn.c
remote.c Merge branch 'bw/ref-prefix-for-configured-refspec' 2018-05-30 21:51:26 +09:00
remote.h Merge branch 'bw/ref-prefix-for-configured-refspec' 2018-05-30 21:51:26 +09:00
replace-object.c Merge branch 'sb/object-store-replace' 2018-05-23 14:38:09 +09:00
replace-object.h
repository.c Merge branch 'nd/repo-clear-keep-the-index' 2018-05-30 14:04:05 +09:00
repository.h
rerere.c Merge branch 'ma/lockfile-cleanup' 2018-05-30 14:04:05 +09:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'js/rebase-i-root-fix' 2018-06-18 11:23:22 -07:00
sequencer.h Merge branch 'js/sequencer-and-root-commits' 2018-05-30 14:04:04 +09:00
serve.c
serve.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c Merge branch 'rd/comment-typofix-in-sha1-file' 2018-06-18 10:18:40 -07:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c Merge branch 'ab/get-short-oid' 2018-05-30 14:04:11 +09:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
shell.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'js/use-bug-macro' 2018-05-30 14:04:07 +09:00
strbuf.h Merge branch 'en/rename-directory-detection-reboot' 2018-05-23 14:38:19 +09:00
streaming.c
streaming.h
string-list.c
string-list.h
sub-process.c
sub-process.h
submodule-config.c Sync with 2.17.2 2018-09-27 11:45:01 -07:00
submodule-config.h Merge branch 'bc/object-id' 2018-05-30 14:04:10 +09:00
submodule.c Merge branch 'jt/submodule-pull-recurse-rebase' 2018-06-04 21:39:48 +09:00
submodule.h Merge branch 'jt/submodule-pull-recurse-rebase' 2018-06-04 21:39:48 +09: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
trailer.c
trailer.h
transport-helper.c
transport-internal.h
transport.c Merge branch 'bw/ref-prefix-for-configured-refspec' 2018-05-30 21:51:26 +09:00
transport.h Merge branch 'bw/ref-prefix-for-configured-refspec' 2018-05-30 21:51:26 +09:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c Merge branch 'ds/lazy-load-trees' 2018-05-23 14:38:13 +09:00
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'ma/unpack-trees-free-msgs' 2018-05-30 21:51:29 +09:00
unpack-trees.h
upload-pack.c upload-pack: fix broken if/else chain in config callback 2018-10-26 10:30:59 +09:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
userdiff.c
userdiff.h
utf8.c Sync with Git 2.17.1 2018-05-29 17:10:05 +09:00
utf8.h Sync with Git 2.17.1 2018-05-29 17:10:05 +09:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c Merge branch 'ds/lazy-load-trees' 2018-05-23 14:38:13 +09: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 'bc/object-id' 2018-05-30 14:04:10 +09:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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