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 Merge branch 'cb/git-gui-ttk-style' 2018-04-25 13:28:49 +09:00
gitk-git
gitweb gitweb: hard-depend on the Digest::MD5 5.8 module 2018-03-05 10:52:27 -08:00
mergetools mergetools: add support for guiffy 2018-04-06 08:11:39 +09:00
negotiator Merge branch 'jt/fetch-negotiator-skipping' 2018-08-02 15:30:46 -07:00
perl Merge branch 'ab/git-svn-get-record-typofix' 2018-05-08 15:59:28 +09:00
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: update from upstream 2018-08-02 13:54:58 -07:00
sha1dc sha1dc: update from upstream 2018-08-02 13:54:58 -07:00
t ref-filter: apply fallback refname sort only after all user sorts 2020-05-04 13:44:46 -07:00
templates Update shell scripts to compute empty tree object ID 2018-05-02 13:59:53 +09:00
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 completion: add and use --list-cmds=alias 2018-05-21 13:23:14 +09:00
alias.h headers: normalize the spelling of some header guards 2018-10-18 13:39:35 +09:00
alloc.c alloc: make allocate_alloc_state and clear_alloc_state more consistent 2018-08-15 11:52:09 -07:00
alloc.h alloc: make allocate_alloc_state and clear_alloc_state more consistent 2018-08-15 11:52:09 -07:00
apply.c Merge branch 'js/apply-recount-allow-noop' 2018-11-18 18:23:56 +09:00
apply.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
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 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.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 banned.h: mark strncpy() as banned 2018-07-26 10:12:51 -07:00
base85.c
bisect.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
bisect.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
blame.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
blame.h blame.c: remove implicit dependency on the_index 2018-08-13 14:14:44 -07:00
blob.c blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
blob.h blob: allow lookup_blob to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
branch.c Merge branch 'ab/unconditional-free-and-null' 2018-08-27 14:33:42 -07:00
branch.h Move definition of enum branch_track from cache.h to branch.h 2018-08-15 11:52:09 -07:00
builtin.h Merge branch 'ag/rebase-i-in-c' 2018-11-02 11:04:53 +09:00
bulk-checkin.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
bulk-checkin.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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 add chdir-notify API 2018-03-30 12:49:57 -07:00
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 & worktree: introduce checkout.defaultRemote 2018-06-11 09:41:02 -07:00
checkout.h checkout: pass the "num_matches" up to callers 2018-06-11 09:41:01 -07:00
color.c color: protect against out-of-bounds reads and writes 2018-08-03 08:52:05 -07:00
color.h range-diff: use dim/bold cues to improve dual color mode 2018-08-13 10:44:52 -07:00
column.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
column.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit-slab-impl.h commit-slabs: move MAYBE_UNUSED out 2018-10-24 14:52:50 +09:00
commit-slab.h commit-slab: support shared commit-slab 2018-05-21 14:07:19 +09:00
commit.c Merge branch 'ds/commit-graph-with-grafts' into maint 2018-11-21 22:57:47 +09:00
commit.h Merge branch 'js/shallow-and-fetch-prune' into maint 2018-11-21 22:57:51 +09:00
common-main.c Merge branch 'dj/runtime-prefix' 2018-05-08 15:59:17 +09:00
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 fixup! connect.h: avoid forward declaration of an enum 2018-07-09 14:35:39 -07:00
connected.c fetch-pack: write shallow, then check connectivity 2018-07-03 14:57:44 -07:00
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 Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
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: refactor finalize_hashfile() method 2018-04-02 14:27:30 -07:00
csum-file.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
ctype.c
daemon.c Merge branch 'lw/daemon-log-destination' 2018-04-25 13:28:58 +09:00
date.c approxidate: fix NULL dereference in date_time() 2018-11-07 11:04:06 +09:00
decorate.c decorate: clean up and document API 2017-12-08 09:16:27 -08:00
decorate.h decorate: clean up and document API 2017-12-08 09:16:27 -08:00
delta-islands.c pack-objects: move 'layer' into 'struct packing_data' 2018-08-16 10:56:44 -07:00
delta-islands.h delta-islands.h: add missing forward declarations (hdr-check) 2018-09-20 11:50:43 -07:00
delta.h
detect-compiler Makefile: detect compiler and enable more warnings in DEVELOPER=1 2018-04-16 13:54:53 +09:00
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 Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
dir-iterator.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
dir.c pathspec: handle non-terminated strings with :(attr) 2018-11-02 20:49:53 +09:00
dir.h dir.c: remove an implicit dependency on the_index in pathspec code 2018-08-13 14:14:42 -07:00
editor.c editor: add a function to launch the sequence editor 2018-08-10 11:56:22 -07:00
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.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
exec-cmd.h Merge branch 'dj/runtime-prefix' 2018-05-08 15:59:17 +09:00
fast-import.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
fetch-negotiator.c negotiator: unknown fetch.negotiationAlgorithm should error out 2018-08-01 11:07:47 -07:00
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 Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
fsmonitor.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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 Merge branch 'pw/add-p-recount' 2018-06-28 12:53:32 -07:00
git-archimport.perl
git-bisect.sh Merge branch 'sb/bisect-run-empty' 2017-11-15 12:14:36 +09:00
git-compat-util.h Sync with 2.19.3 2019-12-06 16:30:49 +01:00
git-cvsexportcommit.perl
git-cvsimport.perl perl: call timegm and timelocal with 4-digit year 2018-02-23 14:47:06 -08:00
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh Merge branch 'mb/filter-branch-optim' 2018-07-18 12:20:32 -07:00
git-instaweb.sh git-instaweb: fix apache2 config with apache >= 2.4 2018-08-08 08:30:07 -07:00
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 merge-one-file: compute empty blob object ID 2018-05-02 13:59:53 +09:00
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 Merge branch 'pw/rebase-signoff' 2018-04-25 13:28:51 +09:00
git-rebase--common.sh rebase: refactor common shell functions into their own file 2018-08-06 13:08:01 -07:00
git-rebase--merge.sh Merge branch 'en/rebase-i-microfixes' 2018-07-18 12:20:33 -07:00
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 Merge branch 'tg/stash-untracked-with-pathspec-fix' 2018-04-10 08:25:45 +09:00
git-submodule.sh Sync with 2.19.3 2019-12-06 16:30:49 +01:00
git-svn.perl git-svn: search --authors-prog in PATH too 2018-04-05 06:55:02 +00:00
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 mingw: include the full version information in the resources 2017-11-01 13:43:52 +09:00
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 hash: update obsolete reference to SHA1_HEADER 2018-02-09 09:56:10 -08:00
hashmap.c
hashmap.h Merge branch 'rb/hashmap-h-compilation-fix' into maint 2018-03-22 14:24:15 -07:00
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 hex: switch to using the_hash_algo 2018-07-16 14:27:39 -07:00
http-backend.c Merge branch 'ds/multi-pack-index' 2018-09-17 13:53:50 -07:00
http-fetch.c Merge branch 'ma/http-walker-no-partial' 2018-05-08 15:59:35 +09:00
http-push.c Upcast size_t variables to uintmax_t when printing 2018-11-12 16:43:52 +09:00
http-walker.c convert "hashcmp() != 0" to "!hasheq()" 2018-08-29 11:32:49 -07:00
http.c Git 2.20.4 2020-04-19 16:28:57 -07:00
http.h Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
ident.c mingw: use domain information for default email 2018-10-16 12:59:57 +09:00
imap-send.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
INSTALL RelNotes: add details on Perl module changes 2018-03-16 16:07:37 -07:00
interdiff.c interdiff: teach show_interdiff() to indent interdiff 2018-07-23 12:50:06 -07:00
interdiff.h interdiff: teach show_interdiff() to indent interdiff 2018-07-23 12:50:06 -07:00
iterator.h
json-writer.c json_writer: new routines to create JSON data 2018-07-16 13:55:39 -07:00
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 Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
kwset.h Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
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 linear-assignment: a function to solve least-cost assignment problems 2018-08-13 10:44:50 -07:00
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 Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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 Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
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 format-patch: make cover letters always text/plain 2018-05-02 12:55:00 +09:00
ls-refs.c ls-refs: introduce ls-refs server command 2018-03-15 12:01:08 -07:00
ls-refs.h ls-refs: introduce ls-refs server command 2018-03-15 12:01:08 -07:00
mailinfo.c mailinfo: support format=flowed 2018-08-29 13:05:35 -07:00
mailinfo.h Merge branch 'rs/mailinfo-format-flowed' 2018-09-17 13:53:57 -07:00
mailmap.c object-store: move object access functions to object-store.h 2018-05-16 11:42:03 +09:00
mailmap.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
Makefile Merge branch 'js/mingw-o-append' into maint 2018-11-21 22:57:44 +09:00
match-trees.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
mem-pool.c block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
mem-pool.h block alloc: add validations around cache_entry lifecyle 2018-07-03 10:58:27 -07:00
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 commit: add repository argument to lookup_commit_reference_gently 2018-06-29 10:43:39 -07:00
notes-cache.h
notes-merge.c Merge branch 'nd/the-index' 2018-10-19 13:34:02 +09:00
notes-merge.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
notes-utils.c commit: add repository argument to lookup_commit 2018-06-29 10:43:39 -07:00
notes-utils.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
notes.c convert "oidcmp() != 0" to "!oideq()" 2018-08-29 11:32:49 -07:00
notes.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
object-store.h packfile: add all_packs list 2018-08-20 15:31:40 -07:00
object.c convert "hashcmp() == 0" to hasheq() 2018-08-29 11:32:49 -07:00
object.h revision.c: generation-based topo-order algorithm 2018-11-02 12:14:22 +09:00
oidmap.c convert hashmap comparison functions to oideq() 2018-08-29 11:32:49 -07:00
oidmap.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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 convert "hashcmp() != 0" to "!hasheq()" 2018-08-29 11:32:49 -07:00
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 convert "hashcmp() != 0" to "!hasheq()" 2018-08-29 11:32:49 -07:00
pack.h csum-file: rename sha1file to hashfile 2018-02-02 11:28:41 -08:00
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 Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
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 Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
pathspec.c pathspec.c: use the right index instead of the_index 2018-08-13 14:14:43 -07:00
pathspec.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
pkt-line.c pkt-line.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
pkt-line.h pkt-line: add packet_buf_write_len function 2018-03-15 12:01:09 -07:00
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 Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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 Merge branch 'en/rename-progress' 2017-12-19 11:33:55 -08:00
progress.h progress: fix progress meters when dealing with lots of work 2017-11-15 13:11:25 +09:00
prompt.c
prompt.h
protocol.c protocol: introduce enum protocol_version value protocol_v2 2018-03-14 14:15:07 -07:00
protocol.h protocol: introduce enum protocol_version value protocol_v2 2018-03-14 14:15:07 -07:00
quote.c Merge branch 'jk/sq-dequote-on-bogus-input' 2018-02-27 10:34:02 -08:00
quote.h trace: avoid unnecessary quoting 2018-01-16 12:16:54 -08:00
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 tree: add repository argument to lookup_tree 2018-06-29 10:43:38 -07:00
reachable.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
read-cache.c Sync with 2.19.3 2019-12-06 16:30:49 +01:00
README.md note git-security@googlegroups.com in more places 2018-06-01 09:24:11 +09:00
rebase-interactive.c rebase -i: introduce the 'break' command 2018-10-12 23:03:04 +09:00
rebase-interactive.h rebase -i: remove unused modes and functions 2018-08-29 13:38:18 -07:00
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 Merge branch 'nd/i18n' 2018-08-15 15:08:23 -07:00
reflog-walk.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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.c: mark more strings for translation 2018-07-23 11:19:10 -07:00
refspec.h refspec: add back a refspec_item_init() function 2018-06-11 10:11:31 -07:00
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 Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
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 commit-graph: not compatible with replace objects 2018-08-21 10:22:51 -07:00
repository.c Merge branch 'sb/object-store-alloc' 2018-06-25 13:22:38 -07:00
repository.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
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.c: use the right index instead of the_index 2018-08-13 14:14:44 -07:00
resolve-undo.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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 Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
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: introduce the server-option capability 2018-04-24 11:24:40 +09:00
serve.h serve: introduce git-serve 2018-03-15 12:01:08 -07:00
server-info.c treewide: use get_all_packs 2018-08-20 15:31:40 -07:00
setup.c worktree: add per-worktree config files 2018-10-22 13:17:04 +09:00
sh-i18n--envsubst.c Replace Free Software Foundation address in license notices 2017-11-09 13:21:21 +09:00
sha1-array.c convert "oidcmp() == 0" to oideq() 2018-08-29 11:32:49 -07:00
sha1-array.h get_short_oid: sort ambiguous objects by type, then SHA-1 2018-05-11 14:43:23 +09:00
sha1-file.c Merge branch 'jk/detect-truncated-zlib-input' into maint 2018-11-21 22:57:52 +09:00
sha1-lookup.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sha1-lookup.h packfile: refactor hash search with fanout table 2018-02-15 13:08:55 -08:00
sha1-name.c Merge branch 'jk/cocci' 2018-09-17 13:53:57 -07:00
sha1dc_git.c
sha1dc_git.h sha1dc_git.h: re-arrange an ifdef chain for a subsequent change 2017-12-08 15:01:01 -08:00
shallow.c Merge branch 'js/shallow-and-fetch-prune' 2018-11-06 15:50:18 +09:00
shell.c Merge branch 'nd/command-list' 2018-06-01 15:06:37 +09:00
shortlog.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
sideband.c sideband: do not read beyond the end of input 2018-08-18 09:16:48 -07:00
sideband.h
sigchain.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
sigchain.h sigchain: add command to pop all common signals 2015-12-16 12:06:08 -08:00
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 split-index: convert struct split_index to object_id 2018-05-02 13:59:50 +09:00
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 streaming: convert open_istream to use struct object_id 2018-03-14 09:23:49 -07:00
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 Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint 2017-10-18 14:19:10 +09:00
sub-process.h Docs: split out long-running subprocess handshake 2018-01-25 11:24:32 -08:00
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 tag.c: allow deref_tag to handle arbitrary repositories 2018-06-29 10:43:40 -07:00
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 Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
tmp-objdir.h
trace.c trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
trace.h trace.h: support nested performance tracing 2018-08-18 09:47:46 -07:00
trailer.c interpret-trailers: allow suppressing "---" divider 2018-08-23 10:08:51 -07:00
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 Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
tree.c Merge branch 'jm/cache-entry-from-mem-pool' 2018-08-02 15:30:43 -07:00
tree.h tree: allow lookup_tree to handle arbitrary repositories 2018-06-29 10:43:39 -07:00
unicode-width.h unicode: update the width tables to Unicode 11 2018-07-09 14:02:51 -07:00
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 fetch-pack: perform a fetch using v2 2018-03-15 12:01:08 -07:00
url.c
url.h Add missing includes and forward declarations 2018-08-15 11:52:09 -07:00
urlmatch.c
urlmatch.h urlmatch.h: fix include guard 2018-08-15 11:52:09 -07:00
usage.c Merge branch 'jk/snprintf-truncation' 2018-05-30 21:51:28 +09:00
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 Merge branch 'jk/size-t' 2018-08-15 15:08:25 -07:00
utf8.h Merge branch 'en/incl-forward-decl' 2018-08-20 12:41:32 -07:00
varint.c
varint.h
version.c version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
version.h version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
versioncmp.c
walker.c Merge branch 'sb/object-store-grafts' 2018-07-18 12:20:28 -07:00
walker.h walker: drop fields of struct walker which are always 1 2018-04-24 10:55:04 +09:00
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 Make running git under other debugger-like programs easy 2018-04-25 10:47:22 +09:00
wrapper.c Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00
write-or-die.c write_or_die.c: rename to use dashes in file name 2018-04-11 18:11:00 +09:00
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 Replace all die("BUG: ...") calls by BUG() ones 2018-05-06 19:06:13 +09:00

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