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 7c5045fc18 ref-filter: apply fallback refname sort only after all user sorts
Commit 9e468334b4 (ref-filter: fallback on alphabetical comparison,
2015-10-30) taught ref-filter's sort to fallback to comparing refnames.
But it did it at the wrong level, overriding the comparison result for a
single "--sort" key from the user, rather than after all sort keys have
been exhausted.

This worked correctly for a single "--sort" option, but not for multiple
ones. We'd break any ties in the first key with the refname and never
evaluate the second key at all.

To make matters even more interesting, we only applied this fallback
sometimes! For a field like "taggeremail" which requires a string
comparison, we'd truly return the result of strcmp(), even if it was 0.
But for numerical "value" fields like "taggerdate", we did apply the
fallback. And that's why our multiple-sort test missed this: it uses
taggeremail as the main comparison.

So let's start by adding a much more rigorous test. We'll have a set of
commits expressing every combination of two tagger emails, dates, and
refnames. Then we can confirm that our sort is applied with the correct
precedence, and we'll be hitting both the string and value comparators.

That does show the bug, and the fix is simple: moving the fallback to
the outer compare_refs() function, after all ref_sorting keys have been
exhausted.

Note that in the outer function we don't have an "ignore_case" flag, as
it's part of each individual ref_sorting element. It's debatable what
such a fallback should do, since we didn't use the user's keys to match.
But until now we have been trying to respect that flag, so the
least-invasive thing is to try to continue to do so. Since all callers
in the current code either set the flag for all keys or for none, we can
just pull the flag from the first key. In a hypothetical world where the
user really can flip the case-insensitivity of keys separately, we may
want to extend the code to distinguish that case from a blanket
"--ignore-case".

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-05-04 13:44:46 -07:00
.github
block-sha1
builtin ref-filter: apply --ignore-case to all sorting keys 2020-05-04 13:41:20 -07:00
ci Merge branch 'ab/dynamic-gettext-poison' 2018-11-19 16:24:39 +09:00
compat Sync with 2.19.3 2019-12-06 16:30:49 +01:00
contrib Merge branch 'jc/cocci-preincr' into maint 2018-11-21 22:58:08 +09:00
Documentation Git 2.20.4 2020-04-19 16:28:57 -07:00
ewah ewok_rlw.h: add missing 'inline' to function definition 2018-10-29 10:14:19 +09:00
git-gui
gitk-git
gitweb
mergetools
negotiator
perl
po l10n: de.po: fix two messages 2018-12-07 19:43:07 +01:00
ppc
refs Merge branch 'nd/per-worktree-ref-iteration' 2018-11-26 23:13:43 +09:00
sha1collisiondetection@232357eb2e
sha1dc
t ref-filter: apply fallback refname sort only after all user sorts 2020-05-04 13:44:46 -07:00
templates
vcs-svn headers: normalize the spelling of some header guards 2018-10-18 13:39:35 +09:00
xdiff xdiff: provide a separate emit callback for hunks 2018-11-02 20:43:02 +09:00
.clang-format editorconfig: indicate settings should be kept in sync 2018-10-09 18:34:15 +09:00
.editorconfig editorconfig: indicate settings should be kept in sync 2018-10-09 18:34:15 +09:00
.gitattributes Merge branch 'ds/hash-independent-tests-fix' into maint 2018-12-15 12:24:32 +09:00
.gitignore Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
.gitmodules
.mailmap Merge branch 'jn/mailmap-update' into maint 2018-11-21 22:57:47 +09:00
.travis.yml Merge branch 'ab/dynamic-gettext-poison' 2018-11-19 16:24:39 +09:00
.tsan-suppressions
abspath.c
aclocal.m4
advice.c reset: warn when refresh_index() takes more than 2 seconds 2018-10-24 11:57:08 +09:00
advice.h reset: warn when refresh_index() takes more than 2 seconds 2018-10-24 11:57:08 +09:00
alias.c
alias.h headers: normalize the spelling of some header guards 2018-10-18 13:39:35 +09:00
alloc.c
alloc.h
apply.c Merge branch 'js/apply-recount-allow-noop' 2018-11-18 18:23:56 +09:00
apply.h
archive-tar.c Upcast size_t variables to uintmax_t when printing 2018-11-12 16:43:52 +09:00
archive-zip.c userdiff.c: remove implicit dependency on the_index 2018-09-21 09:50:58 -07:00
archive.c archive: initialize archivers earlier 2018-10-26 10:17:59 +09:00
archive.h archive: initialize archivers earlier 2018-10-26 10:17:59 +09:00
argv-array.c
argv-array.h
attr.c attr.c: remove #ifdef NO_PTHREADS 2018-11-05 13:42:11 +09:00
attr.h Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
banned.h
base85.c
bisect.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
bisect.h
blame.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
bulk-checkin.c
bulk-checkin.h
bundle.c Merge branch 'jk/close-duped-fd-before-unlock-for-bundle' 2018-11-18 18:23:59 +09:00
bundle.h
cache-tree.c Merge branch 'jt/cache-tree-allow-missing-object-in-partial-clone' 2018-10-19 13:34:08 +09:00
cache-tree.h Merge branch 'nd/unpack-trees-with-cache-tree' 2018-09-17 13:53:53 -07:00
cache.h Merge branch 'bp/refresh-index-using-preload' 2018-11-13 22:37:26 +09:00
chdir-notify.c
chdir-notify.h add chdir-notify API 2018-03-30 12:49:57 -07:00
check_bindir
check-builtins.sh
check-racy.c
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
command-list.txt Merge branch 'du/cherry-is-plumbing' into maint 2018-11-21 22:58:05 +09:00
commit-graph.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
commit-graph.h Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
commit-reach.c commit-reach: implement get_reachable_subset 2018-11-03 00:12:06 +09:00
commit-reach.h Merge branch 'ds/add-missing-tags' 2018-11-13 22:37:24 +09:00
commit-slab-decl.h
commit-slab-impl.h commit-slabs: move MAYBE_UNUSED out 2018-10-24 14:52:50 +09:00
commit-slab.h
commit.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
commit.h Merge branch 'jk/verify-sig-merge-into-void' 2018-11-18 18:23:54 +09:00
common-main.c
config.c index: make index.threads=true enable ieot and eoie 2018-11-21 16:46:54 +09:00
config.h index: make index.threads=true enable ieot and eoie 2018-11-21 16:46:54 +09:00
config.mak.dev Merge branch 'jk/dev-build-format-security' into maint 2018-11-21 22:57:56 +09:00
config.mak.in
config.mak.uname Sync with 2.19.3 2019-12-06 16:30:49 +01:00
configure.ac Merge branch 'dd/poll-dot-h' 2018-11-19 16:24:41 +09:00
connect.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
connect.h
connected.c
connected.h connected: document connectivity in partial clones 2018-09-21 13:20:47 -07:00
convert.c Make git_check_attr() a void function 2018-09-12 15:15:34 -07:00
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c Git 2.18.4 2020-04-19 16:24:14 -07:00
credential.h credential: detect unrepresentable values when parsing urls 2020-03-12 02:55:24 -04:00
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c approxidate: fix NULL dereference in date_time() 2018-11-07 11:04:06 +09:00
decorate.c
decorate.h
delta-islands.c
delta-islands.h delta-islands.h: add missing forward declarations (hdr-check) 2018-09-20 11:50:43 -07:00
delta.h
detect-compiler
diff-delta.c
diff-lib.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
diff-no-index.c diff.c: remove implicit dependency on the_index 2018-09-21 09:48:10 -07:00
diff.c Merge branch 'js/diff-notice-has-drive-prefix' into maint 2018-11-21 22:57:51 +09:00
diff.h Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
diffcore-break.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
diffcore-delta.c diff.c: reduce implicit dependency on the_index 2018-09-21 09:48:10 -07:00
diffcore-order.c
diffcore-pickaxe.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
diffcore-rename.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
diffcore.h diff.c: reduce implicit dependency on the_index 2018-09-21 09:48:10 -07:00
dir-iterator.c
dir-iterator.h
dir.c pathspec: handle non-terminated strings with :(attr) 2018-11-02 20:49:53 +09:00
dir.h
editor.c
entry.c Merge branch 'nd/clone-case-smashing-warning' 2018-11-21 20:39:03 +09:00
environment.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
exec-cmd.c
exec-cmd.h
fast-import.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
fetch-negotiator.c
fetch-negotiator.h headers: normalize the spelling of some header guards 2018-10-18 13:39:35 +09:00
fetch-object.c fetch-object: set exact_oid when fetching 2018-09-13 13:57:31 -07:00
fetch-object.h fetch-object.h: add missing declaration (hdr-check) 2018-10-29 10:14:17 +09:00
fetch-pack.c fetch-pack: be more precise in parsing v2 response 2018-11-01 14:30:22 +09:00
fetch-pack.h fetch-pack: exclude blobs when lazy-fetching trees 2018-10-04 06:03:49 -07:00
fmt-merge-msg.h
fsck.c Git 2.20.4 2020-04-19 16:28:57 -07:00
fsck.h fsck: use oidset instead of oid_array for skipList 2018-09-12 15:17:46 -07:00
fsmonitor.c
fsmonitor.h
fuzz-pack-headers.c fuzz: add basic fuzz testing target. 2018-10-15 14:28:59 +09:00
fuzz-pack-idx.c fuzz: add fuzz testing for packfile indices. 2018-10-15 14:29:03 +09:00
generate-cmdlist.sh Update makefile in preparation for Documentation/config/*.txt 2018-10-29 10:16:59 +09:00
gettext.c i18n: make GETTEXT_POISON a runtime option 2018-11-09 11:25:19 +09:00
gettext.h i18n: make GETTEXT_POISON a runtime option 2018-11-09 11:25:19 +09:00
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Sync with 2.19.3 2019-12-06 16:30:49 +01:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-rebase.sh rebase --stat: fix when rebasing to an unrelated history 2018-11-30 14:43:00 +09:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool: accept -g/--[no-]gui as arguments 2018-10-25 14:01:10 +09:00
git-mergetool.sh mergetool: accept -g/--[no-]gui as arguments 2018-10-25 14:01:10 +09:00
git-p4.py git-p4: fully support unshelving changelists 2018-10-16 13:28:49 +09:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--common.sh
git-rebase--merge.sh
git-rebase--preserve-merges.sh Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'nd/complete-format-patch' 2018-11-13 22:37:28 +09:00
git-sh-i18n.sh i18n: make GETTEXT_POISON a runtime option 2018-11-09 11:25:19 +09:00
git-sh-setup.sh
git-stash.sh
git-submodule.sh Sync with 2.19.3 2019-12-06 16:30:49 +01:00
git-svn.perl
GIT-VERSION-GEN Git 2.20.4 2020-04-19 16:28:57 -07:00
git-web--browse.sh
git.c Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
git.rc
gpg-interface.c Merge branch 'mg/gpg-fingerprint' 2018-11-03 00:53:58 +09:00
gpg-interface.h gpg-interface.c: obtain primary key fingerprint as well 2018-10-23 08:00:43 +09:00
graph.c Merge branch 'np/log-graph-octopus-fix' into maint 2018-11-21 22:57:49 +09:00
graph.h
grep.c grep: remove #ifdef NO_PTHREADS 2018-11-05 13:42:11 +09:00
grep.h grep: remove #ifdef NO_PTHREADS 2018-11-05 13:42:11 +09:00
hash.h
hashmap.c
hashmap.h
help.c help -a: handle aliases with long names gracefully 2018-12-12 17:18:38 +09:00
help.h help.h: fix coding style 2018-12-12 17:18:29 +09:00
hex.c
http-backend.c Merge branch 'ds/multi-pack-index' 2018-09-17 13:53:50 -07:00
http-fetch.c
http-push.c Upcast size_t variables to uintmax_t when printing 2018-11-12 16:43:52 +09:00
http-walker.c
http.c Git 2.20.4 2020-04-19 16:28:57 -07:00
http.h
ident.c mingw: use domain information for default email 2018-10-16 12:59:57 +09:00
imap-send.c
INSTALL
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h json-writer.h: add missing include (hdr-check) 2018-09-20 11:50:00 -07:00
khash.h khash: silence -Wunused-function for delta-islands 2018-10-24 14:52:50 +09:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c line-range.c: remove implicit dependency on the_index 2018-09-21 09:51:18 -07:00
line-log.h
line-range.c line-range.c: remove implicit dependency on the_index 2018-09-21 09:51:18 -07:00
line-range.h line-range.c: remove implicit dependency on the_index 2018-09-21 09:51:18 -07:00
linear-assignment.c linear-assignment: fix potential out of bounds memory access 2018-09-14 09:10:26 -07:00
linear-assignment.h
list-objects-filter-options.c list-objects-filter: implement filter tree:0 2018-10-07 08:55:00 +09:00
list-objects-filter-options.h list-objects-filter: implement filter tree:0 2018-10-07 08:55:00 +09:00
list-objects-filter.c list-objects: support for skipping tree traversal 2018-10-18 12:49:18 +09:00
list-objects-filter.h Merge branch 'md/filter-trees' 2018-10-30 15:43:39 +09:00
list-objects.c Merge branch 'md/filter-trees' 2018-10-30 15:43:39 +09:00
list-objects.h
list.h
ll-merge.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
ll-merge.h ll-merge.c: remove implicit dependency on the_index 2018-09-21 09:48:10 -07:00
lockfile.c
lockfile.h reopen_tempfile(): truncate opened file 2018-09-05 09:46:16 -07:00
log-tree.c range-diff: always pass at least minimal diff options 2018-12-04 10:36:14 +09:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h Merge branch 'rs/mailinfo-format-flowed' 2018-09-17 13:53:57 -07:00
mailmap.c
mailmap.h
Makefile Merge branch 'js/mingw-o-append' into maint 2018-11-21 22:57:44 +09:00
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c merge-blobs.c: remove implicit dependency on the_index 2018-09-21 09:48:10 -07:00
merge-blobs.h merge-blobs.c: remove implicit dependency on the_index 2018-09-21 09:48:10 -07:00
merge-recursive.c Merge branch 'en/double-semicolon-fix' into maint 2018-11-21 22:57:55 +09:00
merge-recursive.h Merge branch 'en/directory-renames-nothanks' 2018-09-04 14:31:38 -07:00
merge.c merge.c: remove implicit dependency on the_index 2018-09-21 09:48:10 -07:00
mergesort.c
mergesort.h
midx.c i18n: fix small typos 2018-11-29 15:45:31 +09:00
midx.h Merge branch 'ds/test-multi-pack-index' 2018-11-13 22:37:19 +09:00
name-hash.c Clean up pthread_create() error handling 2018-11-05 13:42:11 +09:00
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-store.h
object.c
object.h revision.c: generation-based topo-order algorithm 2018-11-02 12:14:22 +09:00
oidmap.c
oidmap.h
oidset.c oidset: uninline oidset_init() 2018-10-04 11:12:14 -07:00
oidset.h oidset: uninline oidset_init() 2018-10-04 11:12:14 -07:00
pack-bitmap-write.c Merge branch 'bc/hash-transition-part-15' 2018-10-30 15:43:42 +09:00
pack-bitmap.c Merge branch 'jk/pack-objects-with-bitmap-fix' 2018-09-17 13:53:58 -07:00
pack-bitmap.h bitmap_has_sha1_in_uninteresting(): drop BUG check 2018-09-04 08:30:48 -07:00
pack-check.c
pack-objects.c Merge branch 'js/pack-objects-mutex-init-fix' 2018-10-30 15:43:43 +09:00
pack-objects.h Merge branch 'cc/delta-islands' 2018-11-21 20:39:02 +09:00
pack-revindex.c pack-revindex: express constants in terms of the_hash_algo 2018-10-15 12:53:15 +09:00
pack-revindex.h
pack-write.c
pack.h
packfile.c Merge branch 'ds/test-multi-pack-index' 2018-11-13 22:37:19 +09:00
packfile.h fuzz: add fuzz testing for packfile indices. 2018-10-15 14:29:03 +09:00
pager.c
parse-options-cb.c assert NOARG/NONEG behavior of parse-options callbacks 2018-11-06 12:56:29 +09:00
parse-options.c Merge branch 'nd/show-gitcomp-compilation-fix' into maint 2018-12-15 12:24:33 +09:00
parse-options.h Merge branch 'nd/show-gitcomp-compilation-fix' into maint 2018-12-15 12:24:33 +09:00
patch-delta.c patch-delta: handle truncated copy parameters 2018-08-30 10:30:23 -07:00
patch-ids.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
patch-ids.h patch-ids.c: remove implicit dependency on the_index 2018-09-21 09:48:11 -07:00
path.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
path.h
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c Merge branch 'nd/pthreads' 2018-11-18 18:23:52 +09:00
pretty.c Merge branch 'jk/trailer-fixes' into maint 2018-11-21 22:57:42 +09:00
pretty.h
prio-queue.c prio-queue: add 'peek' operation 2018-11-02 12:14:21 +09:00
prio-queue.h prio-queue: add 'peek' operation 2018-11-02 12:14:21 +09:00
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c format-patch: do not let its diff-options affect --range-diff 2018-11-30 13:47:55 +09:00
range-diff.h format-patch: do not let its diff-options affect --range-diff 2018-11-30 13:47:55 +09:00
reachable.c
reachable.h
read-cache.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
README.md
rebase-interactive.c rebase -i: introduce the 'break' command 2018-10-12 23:03:04 +09:00
rebase-interactive.h
ref-filter.c ref-filter: apply fallback refname sort only after all user sorts 2020-05-04 13:44:46 -07:00
ref-filter.h ref-filter: apply --ignore-case to all sorting keys 2020-05-04 13:41:20 -07:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
refs.h Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
refspec.c
refspec.h
RelNotes Git 2.20.4 2020-04-19 16:28:57 -07:00
remote-curl.c Merge branch 'en/double-semicolon-fix' into maint 2018-11-21 22:57:55 +09:00
remote-testsvn.c
remote.c remote: make add_missing_tags() linear 2018-11-03 00:12:06 +09:00
remote.h Merge branch 'ds/reachable' 2018-09-17 13:53:52 -07:00
replace-object.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
replace-object.h
repository.c
repository.h
rerere.c Merge branch 'en/rerere-multi-stage-1-fix' into maint 2018-11-21 22:57:44 +09:00
rerere.h rerere.c: remove implicit dependency on the_index 2018-09-21 09:48:11 -07:00
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'md/exclude-promisor-objects-fix' into maint 2018-11-21 22:57:52 +09:00
revision.h Merge branch 'md/exclude-promisor-objects-fix' into maint 2018-11-21 22:57:52 +09:00
run-command.c Merge branch 'jc/run-command-report-exec-failure-fix' into maint 2018-12-15 12:24:34 +09:00
run-command.h send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c 2018-11-05 13:42:11 +09:00
send-pack.c send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.c 2018-11-05 13:42:11 +09:00
send-pack.h
sequencer.c Merge branch 'rs/sequencer-oidset-insert-avoids-dups' into maint 2018-11-21 22:58:02 +09:00
sequencer.h Merge branch 'jk/trailer-fixes' into maint 2018-11-21 22:57:42 +09:00
serve.c
serve.h
server-info.c
setup.c worktree: add per-worktree config files 2018-10-22 13:17:04 +09:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-file.c Merge branch 'jk/detect-truncated-zlib-input' into maint 2018-11-21 22:57:52 +09:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'js/shallow-and-fetch-prune' 2018-11-06 15:50:18 +09:00
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c split-index: BUG() when cache entry refers to non-existing shared entry 2018-10-12 07:23:29 +09:00
split-index.h
strbuf.c Merge branch 'pk/rebase-in-c-3-acts' 2018-11-02 11:04:54 +09:00
strbuf.h Merge branch 'pk/rebase-in-c-3-acts' 2018-11-02 11:04:54 +09:00
streaming.c read_istream_pack_non_delta(): document input handling 2018-10-31 14:32:30 +09:00
streaming.h
string-list.c Merge branch 'sb/string-list-remove-unused' into maint 2018-11-21 22:57:56 +09:00
string-list.h string-list: remove unused function print_string_list 2018-09-11 12:27:58 -07:00
sub-process.c
sub-process.h
submodule-config.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
submodule-config.h submodule: factor out a config_set_in_gitmodules_file_gently function 2018-10-09 12:40:20 +09:00
submodule.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
submodule.h Sync with 2.19.3 2019-12-06 16:30:49 +01:00
symlinks.c
tag.c tag: express constant in terms of the_hash_algo 2018-10-15 12:53:16 +09:00
tag.h
tar.h
tempfile.c reopen_tempfile(): truncate opened file 2018-09-05 09:46:16 -07:00
tempfile.h Merge branch 'jk/reopen-tempfile-truncate' into maint 2018-11-21 22:57:43 +09:00
thread-utils.c thread-utils: macros to unconditionally compile pthreads API 2018-10-29 11:22:48 +09:00
thread-utils.h thread-utils: macros to unconditionally compile pthreads API 2018-10-29 11:22:48 +09:00
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c
trailer.h Merge branch 'jk/trailer-fixes' into maint 2018-11-21 22:57:42 +09:00
transport-helper.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
transport-internal.h transport: list refs before fetch if necessary 2018-10-07 09:53:19 +09:00
transport.c Merge branch 'nd/submodule-unused-vars' 2018-11-06 15:50:20 +09:00
transport.h transport: drop refnames from for_each_alternate_ref 2018-10-09 14:30:02 +09:00
tree-diff.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
tree-walk.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
tree-walk.h
tree.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
unpack-trees.h Merge branch 'nd/clone-case-smashing-warning' 2018-09-17 13:53:47 -07:00
upload-pack.c Merge branch 'jk/uploadpack-packobjectshook-fix' into maint 2018-11-21 22:58:09 +09:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
userdiff.h userdiff.c: remove implicit dependency on the_index 2018-09-21 09:50:58 -07:00
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode 2018-10-29 13:19:22 +09:00
wildmatch.h wildmatch: change behavior of "foo**bar" in WM_PATHNAME mode 2018-10-29 13:19:22 +09:00
worktree.c Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
worktree.h Merge branch 'nd/per-worktree-ref-iteration' 2018-11-13 22:37:26 +09:00
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
wt-status.c status: rebase and merge can be in progress at the same time 2018-11-13 12:04:00 +09:00
wt-status.h roll wt_status_state into wt_status and populate in the collect phase 2018-10-03 23:38:20 -07:00
xdiff-interface.c Merge branch 'jk/xdiff-interface' 2018-11-13 22:37:27 +09:00
xdiff-interface.h xdiff-interface: drop parse_hunk_header() 2018-11-05 13:14:35 +09:00
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