undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
63,294 Commits 1 Branch 0 Tags 217 MiB
C 50%
Shell 38.2%
Perl 5.5%
Tcl 3.5%
Python 0.9%
Other 1.7%
70569fadce
Go to file
Derrick Stolee 70569fadce t1092: document bad 'git checkout' behavior 
Add new branches to the test repo that demonstrate directory/file
conflicts in different ways. Since the directory 'folder1/' has
adjacent files 'folder1-', 'folder1.txt', and 'folder10' it causes
searches for 'folder1/' to land in a different place in the index than a
search for 'folder1'. This causes a change in behavior when working with
the df-conflict-1 and df-conflict-2 branches, whose only difference is
that the first uses 'folder1' as the conflict and the other uses
'folder2' which does not have these adjacent files.

We can extend two tests that compare the behavior across different 'git
checkout' commands, and we see already that the behavior will be
different in some cases and not in others. The difference between the
two test loops is that one uses 'git reset --hard' between iterations.

Further, we isolate the behavior of creating a staged change within a
directory and then checking out a branch where that directory is
replaced with a file. A full checkout behaves differently across these
two cases, while a sparse-checkout cone behaves consistently. In both
cases, the behavior is wrong. In one case, the staged change is dropped
entirely. The other case the staged change is kept, replacing the file
at that location, but none of the other files in the directory are kept.

Likely, the correct behavior in this case is to reject the checkout and
report the conflict, leaving HEAD in its previous location. None of the
cases behave this way currently. Use comments to demonstrate that the
tested behavior is only a documentation of the current, incorrect
behavior to ensure we do not _accidentally_ change it. Instead, we would
prefer to change it on purpose with a future change.

At this point, the sparse-index does not handle these 'git checkout'
commands correctly. Or rather, it _does_ reject the 'git checkout' when
we have the staged change, but for the wrong reason. It also rejects the
'git checkout' commands when there is no staged change and we want to
replace a directory with a file. A fix for that unstaged case will
follow in the next change, but that will make the sparse-index agree
with the full checkout case in these documented incorrect behaviors.

Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-07-20 14:59:11 -07:00
.github cmake(install): include vcpkg dlls 2021-03-29 13:49:04 -07:00
block-sha1 block-sha1: drop trailing semicolon from macro definition 2021-03-17 10:20:01 -07:00
builtin checkout: stop expanding sparse indexes 2021-07-14 15:05:53 -07:00
ci Merge branch 'mt/parallel-checkout-part-3' 2021-05-16 21:05:23 +09:00
compat Merge branch 'jh/simple-ipc-sans-pthread' 2021-05-22 18:29:01 +09:00
contrib contrib/completion: fix zsh completion regression from 59d85a2a05 2021-06-02 12:49:40 +09:00
Documentation The second batch 2021-06-14 13:34:28 +09:00
ewah use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
git-gui Merge https://github.com/prati0100/git-gui 2021-03-04 12:38:50 -08:00
gitk-git Merge remote-tracking branch 'paulus/master' into pm/gitk-update 2020-10-03 10:06:27 -07:00
gitweb gitweb: add "e-mail privacy" feature to redact e-mail addresses 2021-04-08 15:54:26 -07:00
mergetools mergetools/vimdiff: add vimdiff1 merge tool variant 2021-02-23 11:37:13 -08:00
negotiator use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
perl Merge branch 'so/log-m-implies-p' 2021-06-14 13:33:27 +09:00
po l10n: es: 2.32.0 round 1 2021-06-05 20:06:23 -05:00
ppc
refs Merge branch 'wc/packed-ref-removal-cleanup' 2021-05-16 21:05:24 +09:00
sha1collisiondetection@855827c583
sha1dc
sha256
t t1092: document bad 'git checkout' behavior 2021-07-20 14:59:11 -07:00
templates hook: add sample template for push-to-checkout 2020-10-16 08:47:02 -07:00
trace2 Merge branch 'ab/trace2-squelch-gcc-warning' 2021-06-14 13:33:28 +09:00
xdiff Merge branch 'pw/patience-diff-clean-up' 2021-05-14 08:26:08 +09:00
.cirrus.yml
.clang-format
.editorconfig
.gitattributes CoC: explicitly take any whitespace breakage 2021-01-04 09:44:49 -08:00
.gitignore Merge branch 'ls/subtree' 2021-05-10 16:59:47 +09:00
.gitmodules
.mailmap Add entry for Ramkumar Ramachandra 2021-03-08 09:56:34 -08:00
.travis.yml ci: remove GETTEXT_POISON jobs 2021-01-21 15:50:00 -08:00
.tsan-suppressions
abspath.c abspath: add a function to resolve paths with missing components 2020-12-12 23:35:47 -08:00
aclocal.m4
add-interactive.c Merge branch 'rs/xcalloc-takes-nelem-first' 2021-03-19 15:25:39 -07:00
add-interactive.h
add-patch.c Merge branch 'js/add-i-color-fix' 2020-12-08 15:11:17 -08:00
advice.c add: warn when asked to update SKIP_WORKTREE entries 2021-04-08 14:18:03 -07:00
advice.h add: warn when asked to update SKIP_WORKTREE entries 2021-04-08 14:18:03 -07:00
alias.c
alias.h
alloc.c commit: move members graph_pos, generation to a slab 2020-06-17 14:37:30 -07:00
alloc.h object: drop parsed_object_pool->commit_count 2020-06-17 14:37:14 -07:00
apply.c Merge branch 'jz/apply-3way-first-message-fix' 2021-05-07 12:47:38 +09:00
apply.h
archive-tar.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
archive-zip.c archive: read short blobs in archive.c::write_archive_entry() 2020-09-19 15:56:05 -07:00
archive.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
archive.h archive: expand only a single %(describe) per archive 2021-03-11 13:22:44 -08:00
attr.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
attr.h *: remove 'const' qualifier for struct index_state 2021-04-14 13:46:00 -07:00
banned.h banned.h: mark ctime_r() and asctime_r() as banned 2020-12-02 14:30:39 -08:00
base85.c
bisect.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
bisect.h bisect: combine args passed to find_bisection() 2020-08-07 15:13:03 -07:00
blame.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
blame.h blame: simplify 'setup_blame_bloom_data' interface 2020-11-01 15:54:15 -08:00
blob.c object: drop parsed_object_pool->commit_count 2020-06-17 14:37:14 -07:00
blob.h
bloom.c Merge branch 'ah/plugleaks' 2021-05-07 12:47:41 +09:00
bloom.h bloom: encode out-of-bounds filters as non-empty 2020-09-17 21:55:50 -07:00
branch.c Merge branch 'bc/hash-transition-interop-part-1' 2021-05-10 16:59:46 +09:00
branch.h
builtin.h parallel-checkout: make it truly parallel 2021-04-19 11:57:05 -07:00
bulk-checkin.c Use the final_oid_fn to finalize hashing of object IDs 2021-04-27 16:31:38 +09:00
bulk-checkin.h
bundle.c bundle: arguments can be read from stdin 2021-01-11 21:50:41 -08:00
bundle.h Merge branch 'bc/sha-256-part-3' 2020-08-11 18:04:11 -07:00
cache-tree.c commit: integrate with sparse-index 2021-07-14 15:05:53 -07:00
cache-tree.h cache-tree: extract subtree_pos() 2021-01-23 17:14:07 -08:00
cache.h Merge branch 'mt/parallel-checkout-part-3' 2021-05-16 21:05:23 +09:00
chdir-notify.c
chdir-notify.h
check_bindir
check-builtins.sh
checkout.c config: drop git_config_get_string_const() 2020-08-17 15:35:47 -07:00
checkout.h
chunk-format.c csum-file.h: increase hashfile buffer size 2021-05-19 16:41:21 +09:00
chunk-format.h chunk-format: create read chunk API 2021-02-18 13:38:16 -08:00
CODE_OF_CONDUCT.md CoC: update to version 2.0 + local changes 2021-01-13 17:45:04 -08:00
color.c
color.h
column.c Merge branch 'jk/strvec' 2020-08-10 10:23:57 -07:00
column.h
combine-diff.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
command-list.txt mailmap doc: create a new "gitmailmap(5)" man page 2021-01-12 14:04:39 -08:00
commit-graph.c commit-graph: don't store file hashes as struct object_id 2021-04-27 16:31:39 +09:00
commit-graph.h commit-graph: use config to specify generation type 2021-02-25 15:10:41 -08:00
commit-reach.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
commit-reach.h commit-graph: return 64-bit generation number 2021-01-18 16:21:18 -08:00
commit-slab-decl.h Merge branch 'sg/commit-graph-cleanups' into master 2020-07-30 13:20:30 -07:00
commit-slab-impl.h commit-slab: add a function to deep free entries on the slab 2020-06-08 12:28:49 -07:00
commit-slab.h commit-slab: add a function to deep free entries on the slab 2020-06-08 12:28:49 -07:00
commit.c Merge branch 'cm/rebase-i-fixup-amend-reword' 2021-03-26 14:59:03 -07:00
commit.h Merge branch 'cm/rebase-i-fixup-amend-reword' 2021-03-26 14:59:03 -07:00
common-main.c
config.c Merge branch 'ps/config-global-override' 2021-05-07 12:47:39 +09:00
config.h config: unify code paths to get global config paths 2021-04-19 14:16:59 -07:00
config.mak.dev Merge branch 'jc/sparse-error-for-developer-build' 2020-11-18 13:32:54 -08:00
config.mak.in
config.mak.uname Merge branch 'jh/simple-ipc' 2021-04-02 14:43:14 -07:00
configure.ac Remove support for v1 of the PCRE library 2021-01-23 21:15:43 -08:00
connect.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
connect.h Merge branch 'bc/sha-256-part-2' 2020-07-06 22:09:13 -07:00
connected.c Merge branch 'rs/more-buffered-io' 2020-08-24 14:54:31 -07:00
connected.h
convert.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
convert.h Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
copy.c
COPYING
credential.c credential: treat CR/LF as line endings in the credential protocol 2020-10-03 10:41:03 -07:00
credential.h credential: correct order of parameters for credential_match 2020-05-04 22:56:33 -07:00
csum-file.c csum-file.h: increase hashfile buffer size 2021-05-19 16:41:21 +09:00
csum-file.h csum-file.h: increase hashfile buffer size 2021-05-19 16:41:21 +09:00
ctype.c
daemon.c Merge branch 'rs/daemon-sanitize-dir-sep' 2021-04-08 13:23:26 -07:00
date.c date.c: allow compact version of ISO-8601 datetime 2020-04-24 14:06:09 -07:00
decorate.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c diff-lib: handle index diffs with sparse dirs 2021-07-14 13:42:49 -07:00
diff-merges.c diff-merges: let "-m" imply "-p" 2021-05-21 09:24:14 +09:00
diff-merges.h diff-merges: move specific diff-index "-m" handling to diff-index 2021-05-21 09:24:14 +09:00
diff-no-index.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
diff.c Merge branch 'pw/word-diff-zero-width-matches' 2021-05-14 08:26:06 +09:00
diff.h Merge branch 'jc/diffcore-rotate' 2021-02-25 16:43:30 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'en/ort-perf-batch-11' 2021-06-14 13:33:27 +09:00
diffcore-rotate.c diff: --{rotate,skip}-to=<path> 2021-02-16 09:30:42 -08:00
diffcore.h Merge branch 'en/ort-perf-batch-11' 2021-06-14 13:33:27 +09:00
dir-iterator.c
dir-iterator.h
dir.c dir.c: accept a directory as part of cone-mode patterns 2021-07-14 13:42:49 -07:00
dir.h dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
editor.c config: fix leaks from git_config_get_string_const() 2020-08-14 10:52:04 -07:00
entry.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
entry.h entry: add checkout_entry_ca() taking preloaded conv_attrs 2021-03-23 10:34:05 -07:00
environment.c config: allow specifying config entries via envvar pairs 2021-01-15 13:03:45 -08:00
environment.h environment: make getenv_safe() a public function 2021-01-15 13:03:45 -08:00
exec-cmd.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
exec-cmd.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
fetch-negotiator.c negotiator/noop: add noop fetch negotiator 2020-08-18 13:25:05 -07:00
fetch-negotiator.h
fetch-pack.c fetch-pack: signal v2 server that we are done making requests 2021-05-20 07:38:40 +09:00
fetch-pack.h fetch: teach independent negotiation (no packfile) 2021-05-05 10:41:29 +09:00
fmt-merge-msg.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
fmt-merge-msg.h
fsck.c fsck: warn about symlinked dotfiles we'll open with O_NOFOLLOW 2021-05-04 11:52:02 +09:00
fsck.h fsck: warn about symlinked dotfiles we'll open with O_NOFOLLOW 2021-05-04 11:52:02 +09:00
fsmonitor.c Merge branch 'jh/fsmonitor-prework' 2021-03-19 15:25:37 -07:00
fsmonitor.h fsmonitor: add assertion that fsmonitor is valid to check_removed 2021-03-18 13:31:13 -07:00
fuzz-commit-graph.c commit-graph: pass a 'struct repository *' in more places 2020-09-09 12:51:48 -07:00
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh Fit to Plan 9's ANSI/POSIX compatibility layer 2020-09-09 22:31:31 -07:00
generate-configlist.sh
gettext.c Merge branch 'ab/detox-gettext-tests' 2021-02-10 14:48:33 -08:00
gettext.h tests: remove support for GIT_TEST_GETTEXT_POISON 2021-01-21 15:50:01 -08:00
git-add--interactive.perl Merge branch 'js/add-i-color-fix' 2020-12-08 15:11:17 -08:00
git-archimport.perl
git-bisect.sh bisect--helper: reimplement bisect_skip shell function in C 2021-02-03 14:52:09 -08:00
git-compat-util.h Merge branch 'jn/size-t-casted-to-off-t-fix' 2021-06-10 12:04:23 +09:00
git-cvsexportcommit.perl cvsexportcommit: do not run git programs in dashed form 2020-08-26 14:49:52 -07:00
git-cvsimport.perl git-cvsimport: port to SHA-256 2020-06-22 11:21:07 -07:00
git-cvsserver.perl git-cvsserver: port to SHA-256 2020-06-22 11:21:07 -07:00
git-difftool--helper.sh mergetool: break setup_tool out into separate initialization function 2021-02-09 14:09:16 -08:00
git-filter-branch.sh filter-branch: drop $_x40 glob 2021-03-10 14:16:58 -08:00
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh Merge branch 'sh/mergetool-hideresolved' 2021-02-17 17:21:41 -08:00
git-mergetool.sh mergetool: do not enable hideResolved by default 2021-03-13 15:30:29 -08:00
git-p4.py git-p4: speed up search for branch parent 2021-05-06 12:51:33 +09:00
git-quiltimport.sh
git-rebase--preserve-merges.sh rebase: remove unused function reschedule_last_action 2020-08-12 12:25:42 -07:00
git-request-pull.sh
git-send-email.perl Merge branch 'ga/send-email-sendmail-cmd' 2021-06-14 13:33:26 +09:00
git-sh-i18n.sh tests: remove support for GIT_TEST_GETTEXT_POISON 2021-01-21 15:50:01 -08:00
git-sh-setup.sh
git-submodule.sh submodule update: silence underlying fetch with "--quiet" 2021-05-03 12:24:38 +09:00
git-svn.perl perl: check for perl warnings while running tests 2020-10-21 23:11:48 -07:00
GIT-VERSION-GEN Git 2.32 2021-06-06 15:40:01 +09:00
git-web--browse.sh
git.c Merge branch 'ps/config-env-option-with-separate-value' 2021-05-07 12:47:37 +09:00
git.rc
gpg-interface.c gpg-interface: remove other signature headers before verifying 2021-02-10 23:35:42 -08:00
gpg-interface.h gpg-interface: improve interface for parsing tags 2021-02-10 23:35:42 -08:00
graph.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
graph.h
grep.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
grep.h grep/pcre2: move back to thread-only PCREv2 structures 2021-02-17 16:32:19 -08:00
hash-lookup.c oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
hash-lookup.h oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
hash.h parallel-checkout: send the new object_id algo field to the workers 2021-05-18 05:38:54 +09:00
hashmap.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
hashmap.h hashmap: provide deallocation function names 2020-11-02 12:15:50 -08:00
help.c help.c: help.autocorrect=never means "do not compute suggestions" 2020-11-25 13:02:15 -08:00
help.h help: do not expect built-in commands to be hardlinked 2020-10-07 15:25:10 -07:00
hex.c hex: print objects using the hash algorithm member 2021-04-27 16:31:39 +09:00
http-backend.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
http-fetch.c http-fetch: allow custom index-pack args 2021-02-22 12:07:40 -08:00
http-push.c Merge branch 'bc/hash-transition-interop-part-1' 2021-05-10 16:59:46 +09:00
http-walker.c Always use oidread to read into struct object_id 2021-04-27 16:31:38 +09:00
http.c Merge branch 'cs/http-use-basic-after-failed-negotiate' 2021-05-21 05:49:41 +09:00
http.h http: allow custom index-pack args 2021-02-22 12:07:40 -08:00
ident.c Merge branch 'pw/rebase-i-more-options' 2020-09-03 12:37:01 -07:00
imap-send.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
INSTALL INSTALL: note on using Asciidoctor to build doc 2021-03-19 10:49:20 -07:00
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1 provide a copy of the LGPLv2.1 2011-05-19 18:23:17 -07:00
line-log.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
line-log.h line-log: more responsive, incremental 'git log -L' 2020-05-11 09:33:56 -07:00
line-range.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c help: fix small typo in error message 2021-05-21 07:52:10 +09:00
list-objects-filter-options.h list-objects: implement object type filter 2021-04-19 14:09:11 -07:00
list-objects-filter.c list-objects: implement object type filter 2021-04-19 14:09:11 -07:00
list-objects-filter.h list-objects: support filtering by tag and commit 2021-04-12 09:35:50 -07:00
list-objects.c list-objects: support filtering by tag and commit 2021-04-12 09:35:50 -07:00
list-objects.h
list.h
ll-merge.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
ll-merge.h
lockfile.c lockfile.c: introduce 'hold_lock_file_for_update_mode' 2020-04-27 11:27:36 -07:00
lockfile.h lockfile.c: introduce 'hold_lock_file_for_update_mode' 2020-04-27 11:27:36 -07:00
log-tree.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
log-tree.h format-patch: make output filename configurable 2020-11-09 17:44:41 -08:00
ls-refs.c Merge branch 'jt/clone-unborn-head' 2021-02-17 17:21:40 -08:00
ls-refs.h ls-refs: report unborn targets of symrefs 2021-02-05 13:49:53 -08:00
mailinfo.c Merge branch 'ef/mailinfo-short-name' 2021-06-10 12:04:22 +09:00
mailinfo.h am: learn to process quoted lines that ends with CRLF 2021-05-10 15:06:22 +09:00
mailmap.c Merge branch 'jk/open-dotgitx-with-nofollow' 2021-03-22 14:00:22 -07:00
mailmap.h shortlog: remove unused(?) "repo-abbrev" feature 2021-01-12 14:04:42 -08:00
Makefile Merge branch 'jh/simple-ipc-sans-pthread' 2021-05-22 18:29:01 +09:00
match-trees.c Always use oidread to read into struct object_id 2021-04-27 16:31:38 +09:00
mem-pool.c mem-pool: drop trailing semicolon from macro definition 2021-03-17 10:20:16 -07:00
mem-pool.h mem-pool: use consistent pool variable name 2020-08-18 12:16:08 -07:00
merge-blobs.c
merge-blobs.h
merge-ort-wrappers.c merge(s): apply consistent punctuation to "up to date" messages 2021-05-03 14:14:56 +09:00
merge-ort-wrappers.h merge-ort-wrappers: new convience wrappers to mimic the old merge API 2020-10-26 22:36:14 -07:00
merge-ort.c Merge branch 'en/ort-perf-batch-11' 2021-06-14 13:33:27 +09:00
merge-ort.h merge-ort: avoid accidental API mis-use 2021-05-20 15:40:39 +09:00
merge-recursive.c Merge branch 'js/merge-already-up-to-date-message-reword' 2021-05-11 15:27:22 +09:00
merge-recursive.h merge-recursive: fix unclear and outright wrong comments 2020-08-02 11:03:57 -07:00
merge.c dir: fix problematic API to avoid memory leaks 2020-08-18 17:17:31 -07:00
mergesort.c
mergesort.h
midx.c Always use oidread to read into struct object_id 2021-04-27 16:31:38 +09:00
midx.h pack-revindex: write multi-pack reverse indexes 2021-04-01 13:07:37 -07:00
name-hash.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
notes-cache.c
notes-cache.h
notes-merge.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
notes-merge.h
notes-utils.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
notes-utils.h
notes.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
notes.h
object-file.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
object-name.c object-name.c: rename from sha1-name.c 2021-01-04 13:01:55 -08:00
object-store.h packfile: add kept-pack cache for find_kept_pack_entry() 2021-02-22 23:30:52 -08:00
object.c lookup_unknown_object(): take a repository argument 2021-04-13 13:18:46 -07:00
object.h Merge branch 'jt/push-negotiation' 2021-05-16 21:05:22 +09:00
oid-array.c oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
oid-array.h oid-array: provide a for-loop iterator 2020-12-07 12:32:04 -08:00
oidmap.c hashmap: provide deallocation function names 2020-11-02 12:15:50 -08:00
oidmap.h
oidset.c blame: silently ignore invalid ignore file objects 2020-11-10 13:05:06 -08:00
oidset.h blame: validate and peel the object names on the ignore list 2020-09-24 22:20:58 -07:00
pack-bitmap-write.c oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
pack-bitmap.c Merge branch 'ps/rev-list-object-type-filter' 2021-05-07 12:47:41 +09:00
pack-bitmap.h Merge branch 'ps/rev-list-object-type-filter' 2021-05-07 12:47:41 +09:00
pack-check.c fsck: correctly compute checksums on idx files larger than 4GB 2020-11-16 13:41:35 -08:00
pack-objects.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
pack-objects.h pack-objects: move static inline from a header to the sole consumer 2021-05-27 12:14:41 +09:00
pack-revindex.c Merge branch 'tb/reverse-midx' 2021-04-08 13:23:25 -07:00
pack-revindex.h pack-revindex: read multi-pack reverse indexes 2021-04-01 13:07:37 -07:00
pack-write.c Merge branch 'tb/reverse-midx' 2021-04-08 13:23:25 -07:00
pack.h Merge branch 'tb/reverse-midx' 2021-04-08 13:23:25 -07:00
packfile.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
packfile.h packfile: introduce 'find_kept_pack_entry()' 2021-02-22 23:30:52 -08:00
pager.c pager: refactor wait_for_pager() function 2021-02-01 21:15:58 -08:00
parallel-checkout.c parallel-checkout: send the new object_id algo field to the workers 2021-05-18 05:38:54 +09:00
parallel-checkout.h parallel-checkout: support progress displaying 2021-04-19 11:57:05 -07:00
parse-options-cb.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
parse-options.c parse-options: don't leak alias help messages 2021-03-21 14:39:10 -07:00
parse-options.h parse-options: don't leak alias help messages 2021-03-21 14:39:10 -07:00
patch-delta.c
patch-ids.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
patch-ids.h patch-ids: handle duplicate hashmap entries 2021-01-12 11:13:32 -08:00
path.c t0060: test ntfs/hfs-obscured dotfiles 2021-05-04 11:52:02 +09:00
path.h merge-ort: write $GIT_DIR/AUTO_MERGE whenever we hit a conflict 2021-03-20 12:35:40 -07:00
pathspec.c Merge branch 'mt/add-rm-in-sparse-checkout' 2021-05-07 12:47:40 +09:00
pathspec.h Merge branch 'mt/add-rm-in-sparse-checkout' 2021-05-07 12:47:40 +09:00
pkt-line.c pkt-line: do not report packet write errors twice 2021-04-15 15:05:31 -07:00
pkt-line.h pkt-line: add options argument to read_packetized_to_strbuf() 2021-03-15 14:32:50 -07:00
preload-index.c preload-index: log the number of lstat calls to trace2 2021-02-16 17:14:34 -08:00
pretty.c pretty: provide human date format 2021-04-27 16:09:32 +09:00
pretty.h Merge branch 'rs/pretty-describe' 2021-03-22 14:00:24 -07:00
prio-queue.c
prio-queue.h
progress.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
progress.h progress.c: silence cgcc suggestion about internal linkage 2020-04-27 11:21:28 -07:00
promisor-remote.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
promisor-remote.h promisor-remote: remove unused variable 2020-09-21 22:32:49 -07:00
prompt.c
prompt.h
protocol-caps.c object-info: support for retrieving object info 2021-04-20 17:41:13 -07:00
protocol-caps.h object-info: support for retrieving object info 2021-04-20 17:41:13 -07:00
protocol.c protocol: re-enable v2 protocol by default 2020-09-25 11:40:42 -07:00
protocol.h
prune-packed.c
prune-packed.h
quote.c quote: make sq_dequote_step() a public function 2021-01-12 12:03:18 -08:00
quote.h quote: make sq_dequote_step() a public function 2021-01-12 12:03:18 -08:00
range-diff.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
range-diff.h Merge branch 'js/range-diff-one-side-only' 2021-02-17 17:21:41 -08:00
reachable.c Merge branch 'ps/rev-list-object-type-filter' 2021-05-07 12:47:41 +09:00
reachable.h
read-cache.c status: use sparse-index throughout 2021-07-14 13:42:49 -07:00
README.md
rebase-interactive.c rebase -i: clarify and fix 'fixup -c' rebase-todo help 2021-02-10 13:58:19 -08:00
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'zh/ref-filter-push-remote-fix' 2021-05-20 08:55:00 +09:00
ref-filter.h ref-filter: get rid of show_ref_array_item 2021-04-19 15:08:00 -07:00
reflog-walk.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
reflog-walk.h
refs.c Merge branch 'bc/hash-transition-interop-part-1' 2021-05-10 16:59:46 +09:00
refs.h Merge branch 'tb/ls-refs-optim' 2021-02-05 16:40:45 -08:00
refspec.c Merge branch 'fc/atmark-in-refspec' 2020-12-14 10:21:36 -08:00
refspec.h Merge branch 'sb/clone-origin' 2020-10-27 15:09:50 -07:00
RelNotes The first batch post Git 2.32 2021-06-10 12:04:27 +09:00
remote-curl.c remote-curl: fix clone on sha256 repos 2021-05-12 12:14:44 +09:00
remote.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
remote.h Merge branch 'jt/clone-unborn-head' 2021-02-17 17:21:40 -08:00
replace-object.c
replace-object.h
repo-settings.c sparse-index: add index.sparse config option 2021-03-30 12:57:47 -07:00
repository.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
repository.h sparse-index: add index.sparse config option 2021-03-30 12:57:47 -07:00
rerere.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
rerere.h
reset.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
reset.h
resolve-undo.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
resolve-undo.h
revision.c Merge branch 'ah/plugleaks' 2021-05-07 12:47:41 +09:00
revision.h Merge branch 'so/log-m-implies-p' 2021-06-14 13:33:27 +09:00
run-command.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
run-command.h run-command: document use_shell option 2021-01-22 14:21:32 -08:00
SECURITY.md SECURITY: describe how to report vulnerabilities 2021-03-27 15:13:02 -07:00
send-pack.c send-pack: support push negotiation 2021-05-05 10:41:29 +09:00
send-pack.h
sequencer.c Merge branch 'bc/hash-transition-interop-part-1' 2021-05-10 16:59:46 +09:00
sequencer.h sequencer: fix edit handling for cherry-pick and revert messages 2021-03-31 14:10:50 -07:00
serve.c object-info: support for retrieving object info 2021-04-20 17:41:13 -07:00
serve.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
server-info.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
setup.c setup: split "extensions found" messages into singular and plural 2021-05-20 13:36:58 +09:00
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c commit_graft_pos(): take an oid instead of a bare hash 2021-01-28 11:21:07 -08:00
shallow.h shallow: use struct 'shallow_lock' for additional safety 2020-04-30 14:19:13 -07:00
shell.c
shortlog.h shortlog: remove unused(?) "repo-abbrev" feature 2021-01-12 14:04:42 -08:00
sideband.c Merge branch 'jk/sideband-more-error-checking' 2020-11-09 14:06:29 -08:00
sideband.h sideband: diagnose more sideband anomalies 2020-10-29 09:23:29 -07:00
sigchain.c
sigchain.h
simple-ipc.h simple-ipc: correct ifdefs when NO_PTHREADS is defined 2021-05-21 07:55:00 +09:00
sparse-index.c sparse-index: recompute cache-tree 2021-07-14 15:05:53 -07:00
sparse-index.h sparse-index: expand_to_path() 2021-04-14 13:47:54 -07:00
split-index.c Always use oidread to read into struct object_id 2021-04-27 16:31:38 +09:00
split-index.h
stable-qsort.c
strbuf.c mailinfo: also free strbuf lists when clearing mailinfo 2021-04-28 09:25:45 +09:00
strbuf.h Merge branch 'rs/retire-strbuf-write-fd' 2020-06-29 14:17:26 -07:00
streaming.c streaming.c: move {open,close,read} from vtable to "struct git_istream" 2021-05-06 12:56:10 +09:00
streaming.h
string-list.c
string-list.h
strmap.c strmap: take advantage of FLEXPTR_ALLOC_STR when relevant 2020-11-11 12:55:27 -08:00
strmap.h strmap: make callers of strmap_remove() to call it in void context 2020-12-15 15:30:44 -08:00
strvec.c strvec: rename struct fields 2020-07-30 19:18:06 -07:00
strvec.h strvec: rename struct fields 2020-07-30 19:18:06 -07:00
sub-process.c strvec: convert remaining callers away from argv_array name 2020-07-28 15:02:18 -07:00
sub-process.h
submodule-config.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
submodule-config.h
submodule.c Merge branch 'bc/hash-transition-interop-part-1' 2021-05-10 16:59:46 +09:00
submodule.h *: remove 'const' qualifier for struct index_state 2021-04-14 13:46:00 -07:00
symlinks.c checkout: don't follow symlinks when removing entries 2021-03-18 12:58:10 -07:00
tag.c gpg-interface: improve interface for parsing tags 2021-02-10 23:35:42 -08:00
tag.h
tar.h
tempfile.c tempfile.c: introduce 'create_tempfile_mode' 2020-04-27 11:27:35 -07:00
tempfile.h tempfile.c: introduce 'create_tempfile_mode' 2020-04-27 11:27:35 -07:00
thread-utils.c
thread-utils.h
tmp-objdir.c packfile: prepare for the existence of '*.rev' files 2021-01-25 18:32:43 -08:00
tmp-objdir.h
trace2.c trace2: add a public function for getting the SID 2020-11-11 18:26:52 -08:00
trace2.h trace2: add a public function for getting the SID 2020-11-11 18:26:52 -08:00
trace.c http, imap-send: stop using CURLOPT_VERBOSE 2020-05-11 11:18:01 -07:00
trace.h http, imap-send: stop using CURLOPT_VERBOSE 2020-05-11 11:18:01 -07:00
trailer.c trailer: add new .cmd config option 2021-05-04 12:09:43 +09:00
trailer.h pretty format %(trailers): add a "key_value_separator" 2020-12-09 14:16:42 -08:00
transport-helper.c fetch: teach independent negotiation (no packfile) 2021-05-05 10:41:29 +09:00
transport-internal.h connect, transport: encapsulate arg in struct 2021-02-05 13:49:54 -08:00
transport.c fetch-pack: signal v2 server that we are done making requests 2021-05-20 07:38:40 +09:00
transport.h fetch: teach independent negotiation (no packfile) 2021-05-05 10:41:29 +09:00
tree-diff.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
tree-walk.c Always use oidread to read into struct object_id 2021-04-27 16:31:38 +09:00
tree-walk.h
tree.c tree.h API: simplify read_tree_recursive() signature 2021-03-20 16:09:26 -07:00
tree.h tree.h API: simplify read_tree_recursive() signature 2021-03-20 16:09:26 -07:00
unicode-width.h
unimplemented.sh
unix-socket.c unix-socket: disallow chdir() when creating unix domain sockets 2021-03-15 14:32:51 -07:00
unix-socket.h unix-socket: disallow chdir() when creating unix domain sockets 2021-03-15 14:32:51 -07:00
unix-stream-server.c unix-stream-server: create unix domain socket under lock 2021-03-15 14:32:51 -07:00
unix-stream-server.h unix-stream-server: create unix domain socket under lock 2021-03-15 14:32:51 -07:00
unpack-trees.c unpack-trees: unpack sparse directory entries 2021-07-14 13:42:49 -07:00
unpack-trees.h stash show: teach --include-untracked and --only-untracked 2021-03-05 14:31:26 -08:00
upload-pack.c Merge branch 'jt/push-negotiation' 2021-05-16 21:05:22 +09:00
upload-pack.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
url.c
url.h
urlmatch.c credential: handle credential.<partial-URL>.<key> again 2020-04-24 15:53:46 -07:00
urlmatch.h credential: handle credential.<partial-URL>.<key> again 2020-04-24 15:53:46 -07:00
usage.c usage.c: don't copy/paste the same comment three times 2021-04-13 14:56:28 -07:00
userdiff.c Merge branch 'ab/userdiff-tests' 2021-04-20 17:23:34 -07:00
userdiff.h userdiff: add and use for_each_userdiff_driver() 2021-04-08 12:19:10 -07:00
utf8.c t0060: test ntfs/hfs-obscured dotfiles 2021-05-04 11:52:02 +09:00
utf8.h t0060: test ntfs/hfs-obscured dotfiles 2021-05-04 11:52:02 +09:00
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c lookup_unknown_object(): take a repository argument 2021-04-13 13:18:46 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c dir: introduce readdir_skip_dot_and_dotdot() helper 2021-05-27 14:02:37 +09:00
worktree.h worktree: teach worktree to lazy-load "prunable" reason 2021-01-30 09:57:16 -08:00
wrap-for-bin.sh
wrapper.c add open_nofollow() helper 2021-02-16 09:41:32 -08:00
write-or-die.c fsync(): be prepared to see EINTR 2021-06-05 22:13:40 +09:00
ws.c
wt-status.c wt-status: expand added sparse directory entries 2021-07-14 13:42:49 -07:00
wt-status.h status: skip sparse-checkout percentage with sparse-index 2021-07-14 13:42:49 -07:00
xdiff-interface.c hash: provide per-algorithm null OIDs 2021-04-27 16:31:39 +09:00
xdiff-interface.h
zlib.c

README.md

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-<commandname>.txt for documentation of each command. If git has been correctly installed, then the tutorial can also be read with man gittutorial or git help tutorial, and the documentation of each command with man git-<commandname> or git help <commandname>.

CVS users may also want to read Documentation/gitcvs-migration.txt (man gitcvs-migration or git help cvs-migration if git is installed).

The user discussion and development of Git take place on the Git mailing list -- everyone is welcome to post bug reports, feature requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). 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://lore.kernel.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

The maintainer frequently sends the "What's cooking" reports that list the current status of various development topics to the mailing list. The discussion following them give a good reference for project status, development direction and remaining tasks.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (depending on your mood):

  • random three-letter combination that is pronounceable, and not actually used by any common UNIX command. The fact that it is a mispronunciation of "get" may or may not be relevant.
  • stupid. contemptible and despicable. simple. Take your pick from the dictionary of slang.
  • "global information tracker": you're in a good mood, and it actually works for you. Angels sing, and a light suddenly fills the room.
  • "goddamn idiotic truckload of sh*t": when it breaks