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/
67,389 Commits 1 Branch 0 Tags 217 MiB
C 50%
Shell 38.2%
Perl 5.5%
Tcl 3.5%
Python 0.9%
Other 1.7%
c23fc075c6
Go to file
Elijah Newren c23fc075c6 merge: do not exit restore_state() prematurely 
Previously, if the user:

* Had no local changes before starting the merge
* A merge strategy makes changes to the working tree/index but returns
  with exit status 2

Then we'd call restore_state() to clean up the changes and either let
the next merge strategy run (if there is one), or exit telling the user
that no merge strategy could handle the merge.  Unfortunately,
restore_state() did not clean up the changes as expected; that function
was a no-op if the stash was a null, and the stash would be null if
there were no local changes before starting the merge.  So, instead of
"Rewinding the tree to pristine..." as the code claimed, restore_state()
would leave garbage around in the index and working tree (possibly
including conflicts) for either the next merge strategy or for the user
after aborting the merge.  And in the case of aborting the merge, the
user would be unable to run "git merge --abort" to get rid of the
unintended leftover conflicts, because the merge control files were not
written as it was presumed that we had restored to a clean state
already.

Fix the main problem by making sure that restore_state() only skips the
stash application if the stash is null rather than skipping the whole
function.

However, there is a secondary problem -- since merge.c forks
subprocesses to do the cleanup, the in-memory index is left out-of-sync.
While there was a refresh_cache(REFRESH_QUIET) call that attempted to
correct that, that function would not handle cases where the previous
merge strategy added conflicted entries.  We need to drop the index and
re-read it to handle such cases.

(Alternatively, we could stop forking subprocesses and instead call some
appropriate function to do the work which would update the in-memory
index automatically.  For now, just do the simple fix.)

Also, add a testcase checking this, one for which the octopus strategy
fails on the first commit it attempts to merge, and thus which it
cannot handle at all and must completely bail on (as per the "exit 2"
code path of commit 98efc8f3d8 ("octopus: allow manual resolve on the
last round.", 2006-01-13)).

Reported-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-22 21:45:23 -07:00
.github ci(github): bring back the 'print test failures' step 2022-06-08 16:12:37 -07:00
block-sha1 block-sha1: remove use of obsolete x86 assembly 2022-03-10 11:18:05 -08:00
builtin merge: do not exit restore_state() prematurely 2022-07-22 21:45:23 -07:00
ci Merge branch 'js/ci-github-workflow-markup' 2022-06-17 10:33:32 -07:00
compat Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
contrib Merge branch 'rs/cocci-array-copy' 2022-07-19 16:40:18 -07:00
Documentation The fifth batch 2022-07-19 16:40:19 -07:00
ewah Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
git-gui
gitk-git Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk 2022-05-11 08:25:02 -07:00
gitweb Merge branch 'ab/build-gitweb' 2022-07-18 13:31:55 -07:00
mergetools vimdiff: make layout engine more robust against user vim settings 2022-07-08 13:15:50 -07:00
negotiator
perl perl Git.pm: don't ignore signalled failure in _cmd_close() 2022-02-01 15:21:19 -08:00
po l10n: sv.po: Update Swedish translation (5367t0f0u) 2022-06-26 20:38:46 +08:00
ppc
refs Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
reftable Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256 sha256: add support for Nettle 2022-07-10 14:43:34 -07:00
t merge: do not exit restore_state() prematurely 2022-07-22 21:45:23 -07:00
templates fsmonitor: query watchman with right valid json 2022-06-07 10:00:49 -07:00
trace2 trace2: use designated initializers for "struct tr2_dst" 2022-02-24 15:58:55 -08:00
xdiff Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
.cirrus.yml ci: update Cirrus-CI image to FreeBSD 12.3 2022-05-25 08:47:11 -07:00
.clang-format
.editorconfig
.gitattributes
.gitignore Makefile & .gitignore: ignore & clean "git.res", not "*.res" 2022-07-06 12:24:43 -07:00
.gitmodules
.mailmap mailmap: change primary address for Derrick Stolee 2022-02-14 13:27:31 -08:00
.tsan-suppressions
abspath.c
aclocal.m4
add-interactive.c Merge 'js/add-i-delete' into maint-2.37 2022-07-04 13:40:59 -07:00
add-interactive.h
add-patch.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
advice.c Merge branch 'tk/ambiguous-fetch-refspec' 2022-04-04 10:56:24 -07:00
advice.h Merge branch 'tk/ambiguous-fetch-refspec' 2022-04-04 10:56:24 -07:00
alias.c
alias.h
alloc.c alloc.[ch]: remove alloc_report() function 2022-04-01 10:16:11 -07:00
alloc.h alloc.[ch]: remove alloc_report() function 2022-04-01 10:16:11 -07:00
apply.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
apply.h range-diff: plug memory leak in common invocation 2022-03-04 13:24:19 -08:00
archive-tar.c archive-tar: use internal gzip by default 2022-06-15 13:19:47 -07:00
archive-zip.c Merge branch 'ab/c99-designated-initializers' 2022-03-06 21:25:32 -08:00
archive.c archive --add-virtual-file: allow paths containing colons 2022-05-30 23:07:31 -07:00
archive.h archive: rename archiver data field to filter_command 2022-06-15 13:19:46 -07:00
attr.c Merge branch 'ab/refs-various-fixes' 2022-03-29 12:22:02 -07:00
attr.h attr.h: remove duplicate struct definition 2022-03-14 05:41:08 +00:00
banned.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
base85.c
bisect.c revisions API users: use release_revisions() needing REV_INFO_INIT 2022-04-13 23:56:08 -07:00
bisect.h bisect: output state before we are ready to compute bisection 2022-05-11 12:35:11 -07:00
blame.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c Merge branch 'ds/branch-checked-out' 2022-07-11 15:38:51 -07:00
branch.h Merge branch 'ds/branch-checked-out' 2022-07-11 15:38:51 -07:00
builtin.h fsmonitor--daemon: add a built-in fsmonitor daemon 2022-03-25 16:04:15 -07:00
bulk-checkin.c Merge branch 'tb/cruft-packs' 2022-06-03 14:30:37 -07:00
bulk-checkin.h core.fsyncmethod: batched disk flushes for loose-objects 2022-04-06 13:13:01 -07:00
bundle.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
bundle.h bundle.h: make "fd" version of read_bundle_header() public 2022-05-16 15:02:10 -07:00
cache-tree.c cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache-tree.h cache-tree: remove cache_tree_find_path() 2022-06-16 11:59:56 -07:00
cache.h Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
cbtree.c cbtree: remove broken and unused cb_unlink 2021-12-07 15:18:35 -08:00
cbtree.h cbtree: remove broken and unused cb_unlink 2021-12-07 15:18:35 -08:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
checkout.h
chunk-format.c chunk-format.h: extract oid_version() 2022-05-26 15:48:26 -07:00
chunk-format.h chunk-format.h: extract oid_version() 2022-05-26 15:48:26 -07:00
CODE_OF_CONDUCT.md CODE_OF_CONDUCT.md: update PLC members list 2022-02-18 12:36:29 -08:00
color.c color: allow colors to be prefixed with "reset" 2021-10-28 09:37:18 -07:00
color.h color: allow colors to be prefixed with "reset" 2021-10-28 09:37:18 -07:00
column.c
column.h
combine-diff.c Merge branch 'rs/combine-diff-with-incompatible-options' 2022-07-11 15:38:48 -07:00
command-list.txt hook: add 'run' subcommand 2022-01-07 15:19:34 -08:00
commit-graph.c Merge branch 'hx/lookup-commit-in-graph-fix' 2022-07-19 16:40:16 -07:00
commit-graph.h commit-graph: fix memory leak in misused string_list API 2022-03-04 13:24:18 -08:00
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
commit.h shallow: reset commit grafts when shallow is reset 2022-03-17 17:44:38 -07:00
common-main.c usage.c: add a non-fatal bug() function to go with BUG() 2022-06-02 12:51:35 -07:00
config.c Merge branch 'ns/batch-fsync' 2022-06-03 14:30:34 -07:00
config.h fsmonitor: config settings are repository-specific 2022-03-25 16:04:15 -07:00
config.mak.dev Revert -Wno-error=dangling-pointer 2022-06-01 08:49:13 -07:00
config.mak.in
config.mak.uname Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
configure.ac Merge branch 'ab/misc-cleanup' 2022-05-10 17:41:10 -07:00
connect.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
connect.h
connected.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
connected.h connected: refactor iterator to return next object ID directly 2021-09-01 12:43:56 -07:00
convert.c convert: clarify line ending conversion warning 2022-04-08 12:53:34 -07:00
convert.h
copy.c
COPYING
credential.c urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
credential.h *.h: move some *_INIT to designated initializers 2021-07-01 12:31:45 -07:00
csum-file.c core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
csum-file.h core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
ctype.c
daemon.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
date.c date API: add and use a date_mode_release() 2022-02-16 09:40:00 -08:00
date.h date API: add and use a date_mode_release() 2022-02-16 09:40:00 -08:00
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h odb: guard against data loss checking out a huge file 2021-11-03 11:22:27 -07:00
detect-compiler detect-compiler: make detection independent of locale 2022-05-09 08:52:26 -07:00
diff-delta.c diff-delta: set size out-parameter to 0 for NULL delta 2019-09-06 11:03:39 -07:00
diff-lib.c revisions API: add a TODO for diff_free(&revs->diffopt) 2022-04-13 23:56:10 -07:00
diff-merges.c Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
diff-merges.h diff-index: restore -c/--cc options handling 2021-09-07 11:11:35 -07:00
diff-no-index.c
diff.c Merge branch 'ab/cocci-unused' 2022-07-18 13:31:57 -07:00
diff.h Merge branch 'js/diff-filter-negation-fix' 2022-02-16 15:14:30 -08:00
diffcore-break.c
diffcore-delta.c diffcore-delta.c: LLP64 compatibility, upcast unity for left shift 2021-12-01 14:48:10 -08:00
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
diffcore-rotate.c
diffcore.h merge-ort: store filepairs and filespecs in our mem_pool 2021-07-30 09:01:19 -07:00
dir-iterator.c dir-iterator: add flags parameter to dir_iterator_begin 2019-07-11 13:52:15 -07:00
dir-iterator.h
dir.c Merge branch 'gg/worktree-from-the-above' 2022-07-14 15:03:58 -07:00
dir.h dir API: add a generalized path_match_flags() function 2022-05-16 15:02:09 -07:00
editor.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
entry.c Merge branch 'mc/clean-smudge-with-llp64' 2021-11-29 15:41:51 -08:00
entry.h Merge branch 'mc/clean-smudge-with-llp64' 2021-11-29 15:41:51 -08:00
environment.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
environment.h
exec-cmd.c
exec-cmd.h argv-array: rename to strvec 2020-07-28 15:02:17 -07:00
fetch-negotiator.c fetch-negotiator: add specific noop initializer 2022-03-28 10:25:52 -07:00
fetch-negotiator.h fetch-negotiator: add specific noop initializer 2022-03-28 10:25:52 -07:00
fetch-pack.c Merge branch 'ds/bundle-uri' 2022-06-03 14:30:34 -07:00
fetch-pack.h fetch-pack: add refetch 2022-03-28 10:25:52 -07:00
fmt-merge-msg.c revisions API users: add straightforward release_revisions() 2022-04-13 23:56:08 -07:00
fmt-merge-msg.h merge: allow to pretend a merge is made into a different branch 2021-12-20 14:55:02 -08:00
fsck.c dir API: add a generalized path_match_flags() function 2022-05-16 15:02:09 -07:00
fsck.h
fsmonitor--daemon.h fsmonitor--daemon: stub in health thread 2022-05-26 15:59:27 -07:00
fsmonitor-ipc.c fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-03-25 16:04:15 -07:00
fsmonitor-ipc.h fsmonitor-ipc: create client routines for git-fsmonitor--daemon 2022-03-25 16:04:15 -07:00
fsmonitor-settings.c fsmonitor: avoid memory leak in fsm_settings__get_incompatible_msg() 2022-06-16 13:22:03 -07:00
fsmonitor-settings.h fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible 2022-05-26 15:59:26 -07:00
fsmonitor.c fsmonitor: never set CE_FSMONITOR_VALID on submodules 2022-05-26 15:59:27 -07:00
fsmonitor.h fsmonitor: never set CE_FSMONITOR_VALID on submodules 2022-05-26 15:59:27 -07:00
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh generate-cmdlist.sh: don't parse command-list.txt thrice 2021-11-05 12:01:13 -07:00
generate-configlist.sh
generate-hooklist.sh hook-list.h: add a generated list of hooks, like config-list.h 2021-09-27 09:44:54 -07:00
gettext.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
gettext.h gettext: remove optional non-standard parens in N_() definition 2021-09-03 11:40:30 -07:00
git-add--interactive.perl add -p: avoid use of undefined $key when ReadKey -> EOF 2021-11-28 15:14:09 -08:00
git-archimport.perl
git-bisect.sh Merge branch 'mr/bisect-in-c-4' 2021-09-23 13:44:48 -07:00
git-compat-util.h Sync with 2.35.4 2022-06-23 12:36:12 +02:00
git-curl-compat.h http: check CURLE_SSL_PINNEDPUBKEYNOTMATCH when emitting errors 2021-09-27 10:58:07 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl tests: disable fsync everywhere 2021-10-29 10:22:40 -07:00
git-difftool--helper.sh
git-filter-branch.sh git-sh-setup: remove "sane_grep", it's not needed anymore 2021-10-21 16:17:57 -07:00
git-instaweb.sh git-sh-setup.sh: remove "say" function, change last users 2022-06-28 13:13:18 -07:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh merge-resolve: abort if index does not match HEAD 2022-07-22 21:45:22 -07:00
git-mergetool--lib.sh vimdiff: add tool documentation 2022-04-03 15:09:52 -07:00
git-mergetool.sh
git-p4.py Merge branch 'tk/p4-metadata-coding-strategies' 2022-05-20 15:27:00 -07:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl i18n: fix some badly formatted i18n strings 2022-04-11 14:13:46 -07:00
git-sh-i18n.sh git-sh-i18n: remove unused eval_ngettext() 2021-10-21 16:04:29 -07:00
git-sh-setup.sh git-sh-setup.sh: remove "say" function, change last users 2022-06-28 13:13:18 -07:00
git-submodule.sh git-submodule.sh: use "$quiet", not "$GIT_QUIET" 2022-06-28 13:13:18 -07:00
git-svn.perl git-svn: drop support for --preserve-merges 2021-09-07 21:45:33 -07:00
GIT-VERSION-GEN Git 2.37.1 2022-07-04 13:45:08 -07:00
git-web--browse.sh
git.c merge-tree: add option parsing and initial shell for real merge function 2022-06-22 16:10:05 -07:00
git.rc
gpg-interface.c gpg-interface: add function for converting trust level to string 2022-07-10 22:10:23 -07:00
gpg-interface.h gpg-interface: add function for converting trust level to string 2022-07-10 22:10:23 -07:00
graph.c log: fix memory leak if --graph is passed multiple times 2022-02-11 10:06:40 -08:00
graph.h log: fix memory leak if --graph is passed multiple times 2022-02-11 10:06:40 -08:00
grep.c grep: add --max-count command line option 2022-06-22 13:23:29 -07:00
grep.h grep: add --max-count command line option 2022-06-22 13:23:29 -07:00
hash-lookup.c
hash-lookup.h
hash.h sha256: add support for Nettle 2022-07-10 14:43:34 -07:00
hashmap.c
hashmap.h
help.c Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
help.h help: add --no-[external-commands|aliases] for use with --all 2022-02-23 13:41:37 -08:00
hex.c hex: print objects using the hash algorithm member 2021-04-27 16:31:39 +09:00
hook.c Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
hook.h hooks: fix an obscure TOCTOU "did we just run a hook?" race 2022-03-07 13:00:53 -08:00
http-backend.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
http-fetch.c Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 2022-05-02 10:06:04 -07:00
http-push.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
http-walker.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
http.c Merge branch 'll/curl-accept-language' 2022-07-19 16:40:19 -07:00
http.h remote-curl: send Accept-Language header to server 2022-07-11 12:24:28 -07:00
ident.c date API: create a date.h, split from cache.h 2022-02-16 09:40:00 -08:00
imap-send.c Merge branch 'bc/csprng-mktemps' 2022-04-06 15:21:59 -07:00
INSTALL INSTALL: mention that we need libcurl 7.19.4 or newer to build 2021-09-13 10:39:03 -07:00
iterator.h
json-writer.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
json-writer.h *.h: move some *_INIT to designated initializers 2021-07-01 12:31:45 -07:00
khash.h khash: clarify that allocations never fail 2021-07-06 13:07:50 -07:00
kwset.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c pack-objects: lazily set up "struct rev_info", don't leak 2022-03-28 09:57:21 -07:00
list-objects-filter-options.h pack-objects: lazily set up "struct rev_info", don't leak 2022-03-28 09:57:21 -07:00
list-objects-filter.c
list-objects-filter.h
list-objects.c list-objects: handle NULL function pointers 2022-03-09 10:25:27 -08:00
list-objects.h list-objects: consolidate traverse_commit_list[_filtered] 2022-03-09 10:25:27 -08:00
list.h *.h: move some *_INIT to designated initializers 2021-09-27 14:48:00 -07:00
ll-merge.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
ll-merge.h ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
lockfile.c
lockfile.h *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
log-tree.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
log-tree.h log-tree.h: remove unused function declarations 2021-10-01 14:39:46 -07:00
ls-refs.c i18n: factorize "invalid value" messages 2022-02-04 13:58:28 -08:00
ls-refs.h serve.[ch]: don't pass "struct strvec *keys" to commands 2021-08-05 08:59:37 -07:00
mailinfo.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
mailinfo.h
mailmap.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
mailmap.h
Makefile Merge branch 'bc/nettle-sha256' 2022-07-18 13:31:58 -07:00
match-trees.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
mem-pool.c mem-pool: don't assume uintmax_t is aligned enough for all types 2022-01-24 10:26:40 -08:00
mem-pool.h mem-pool: use consistent pool variable name 2020-08-18 12:16:08 -07:00
merge-blobs.c ll-merge: make callers responsible for showing warnings 2022-02-02 10:02:27 -08:00
merge-blobs.h
merge-ort-wrappers.c merge-ort-wrappers: make printed message match the one from recursive 2022-07-22 21:45:22 -07:00
merge-ort-wrappers.h
merge-ort.c Merge branch 'en/merge-dual-dir-renames-fix' 2022-07-18 13:31:56 -07:00
merge-ort.h merge-ort: optionally produce machine-readable output 2022-06-22 16:10:06 -07:00
merge-recursive.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
merge-recursive.h merge-ort: format messages slightly different for use in headers 2022-02-02 10:02:27 -08:00
merge.c unpack-trees: introduce preserve_ignored to unpack_trees_options 2021-09-27 13:38:37 -07:00
mergesort.c mergesort: avoid left shift overflow 2021-11-18 12:42:06 -08:00
mergesort.h
midx.c Merge branch 'ds/midx-normalize-pathname-before-comparison' into maint 2022-06-08 14:27:53 -07:00
midx.h midx: read RIDX chunk when present 2022-01-27 12:07:53 -08:00
name-hash.c Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
notes-cache.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
notes-cache.h
notes-merge.c misc *.c: use designated initializers for struct assignments 2022-03-17 10:36:42 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c object-file API: have write_object_file() take "enum object_type" 2022-02-25 17:16:31 -08:00
notes.h
object-file.c Merge branch 'hx/unpack-streaming' 2022-07-14 15:03:59 -07:00
object-name.c object-name: diagnose trees in index properly 2022-04-26 13:56:39 -07:00
object-store.h object-file.c: add "stream_loose_object()" to handle large object 2022-06-13 10:22:35 -07:00
object.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
object.h reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
oid-array.c
oid-array.h *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
oidmap.c
oidmap.h
oidset.c oidset: make oidset_size() an inline function 2021-09-12 16:14:32 -07:00
oidset.h oidset: make oidset_size() an inline function 2021-09-12 16:14:32 -07:00
oidtree.c oidtree: avoid unaligned access to crit-bit tree 2021-08-15 13:13:50 -07:00
oidtree.h oidtree: a crit-bit tree for odb_loose_cache 2021-07-07 21:28:04 -07:00
pack-bitmap-write.c Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
pack-bitmap.c Merge branch 'tb/midx-race-in-pack-objects' 2022-06-03 14:30:35 -07:00
pack-bitmap.h pack-bitmap: drop filter in prepare_bitmap_walk() 2022-03-09 10:25:27 -08:00
pack-check.c object-file API: have hash_object_file() take "enum object_type" 2022-02-25 17:16:32 -08:00
pack-mtimes.c pack-mtimes: avoid closing a bogus file descriptor 2022-06-16 13:22:03 -07:00
pack-mtimes.h pack-mtimes: support reading .mtimes files 2022-05-26 15:48:26 -07:00
pack-objects.c pack-mtimes: support writing pack .mtimes files 2022-05-26 15:48:26 -07:00
pack-objects.h pack-objects.h: remove outdated pahole results 2022-06-28 15:39:03 -07:00
pack-revindex.c midx: read RIDX chunk when present 2022-01-27 12:07:53 -08:00
pack-revindex.h pack-revindex.h: correct the time complexity descriptions 2021-09-15 22:16:25 -07:00
pack-write.c pack-write: drop always-NULL parameter 2022-06-16 11:59:55 -07:00
pack.h pack-mtimes: support writing pack .mtimes files 2022-05-26 15:48:26 -07:00
packfile.c Merge branch 'jk/optim-promisor-object-enumeration' 2022-07-11 15:38:50 -07:00
packfile.h Merge branch 'tb/pack-revindex-on-disk-cleanup' 2021-12-15 09:39:50 -08:00
pager.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
parallel-checkout.c i18n: factorize "invalid value" messages 2022-02-04 13:58:28 -08:00
parallel-checkout.h
parse-options-cb.c branch: add flags and config to inherit tracking 2021-12-20 22:40:21 -08:00
parse-options.c parse-options.c: use optbug() instead of BUG() "opts" check 2022-06-02 12:51:35 -07:00
parse-options.h Merge branch 'ja/i18n-common-messages' 2022-02-25 15:47:35 -08:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c Merge branch 'ds/bundle-uri' 2022-06-03 14:30:34 -07:00
path.h repository.c: free the "path cache" in repo_clear() 2022-03-04 13:24:19 -08:00
pathspec.c Merge branch 'jc/all-negative-pathspec' 2022-06-07 14:10:59 -07:00
pathspec.h pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>) 2021-12-07 12:31:17 -08:00
pkt-line.c fetch-pack: redact packfile urls in traces 2021-11-11 10:07:43 -08:00
pkt-line.h fetch-pack: redact packfile urls in traces 2021-11-11 10:07:43 -08:00
preload-index.c
pretty.c gpg-interface: add function for converting trust level to string 2022-07-10 22:10:23 -07:00
pretty.h date API: create a date.h, split from cache.h 2022-02-16 09:40:00 -08:00
prio-queue.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
prio-queue.h
progress.c progress API: unify stop_progress{,_msg}(), fix trace2 bug 2022-02-03 15:39:59 -08:00
progress.h progress API: unify stop_progress{,_msg}(), fix trace2 bug 2022-02-03 15:39:59 -08:00
promisor-remote.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
promisor-remote.h promisor-remote: support per-repository config 2021-06-28 09:57:42 -07:00
prompt.c run-command API users: use strvec_push(), not argv construction 2021-11-25 22:15:07 -08:00
prompt.h
protocol-caps.c Merge branch 'ab/serve-cleanup' 2021-09-20 15:20:43 -07:00
protocol-caps.h serve.[ch]: don't pass "struct strvec *keys" to commands 2021-08-05 08:59:37 -07:00
protocol.c connect, protocol: log negotiated protocol version 2021-08-10 11:46:33 -07:00
protocol.h
prune-packed.c
prune-packed.h
quote.c ref-filter: --format=%(raw) support --perl 2021-07-26 12:01:25 -07:00
quote.h Merge branch 'zh/ref-filter-raw-data' 2021-08-24 15:32:37 -07:00
range-diff.c Merge branch 'pb/range-diff-with-submodule' 2022-06-13 15:53:41 -07:00
range-diff.h
reachable.c reachable: report precise timestamps from objects in cruft packs 2022-05-26 15:48:26 -07:00
reachable.h builtin/pack-objects.c: --cruft with expiration 2022-05-26 15:48:26 -07:00
read-cache.c read_index_from(): avoid memory leak 2022-06-16 13:22:03 -07:00
README.md Merge branch 'po/readme-mention-contributor-hints' 2022-02-09 14:20:59 -08:00
rebase-interactive.c rebase: remove a no-longer-used function 2021-09-07 21:45:33 -07:00
rebase-interactive.h rebase: remove a no-longer-used function 2021-09-07 21:45:33 -07:00
rebase.c pull: remove support for --rebase=preserve 2021-09-07 21:45:32 -07:00
rebase.h pull: remove support for --rebase=preserve 2021-09-07 21:45:32 -07:00
ref-filter.c ref-filter: disable save_commit_buffer while traversing 2022-07-11 14:27:31 -07:00
ref-filter.h for-each-ref: delay parsing of --sort=<atom> options 2021-10-20 14:33:07 -07:00
reflog-walk.c revisions API: release "reflog_info" in release revisions() 2022-04-13 23:56:10 -07:00
reflog-walk.h revisions API: release "reflog_info" in release revisions() 2022-04-13 23:56:10 -07:00
reflog.c Merge branch 'ab/reflog-parse-options' 2022-04-04 10:56:21 -07:00
reflog.h reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
refs.c clone: die() instead of BUG() on bad refs 2022-04-25 11:05:28 -07:00
refs.h Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'" 2022-04-13 15:51:33 -07:00
refspec.c refspec.c: use designated initializers for "struct refspec_item" 2022-02-24 15:59:53 -08:00
refspec.h
RelNotes Git 2.37.1 2022-07-04 13:45:08 -07:00
remote-curl.c remote-curl: send Accept-Language header to server 2022-07-11 12:24:28 -07:00
remote.c Merge branch 'jk/remote-show-with-negative-refspecs' 2022-07-13 14:54:54 -07:00
remote.h remote: handle negative refspecs in git remote show 2022-06-17 10:03:59 -07:00
replace-object.c
replace-object.h
repo-settings.c compat/fsmonitor/fsm-listen-win32: stub in backend for Windows 2022-03-25 16:04:15 -07:00
repository.c Merge branch 'ab/plug-random-leaks' 2022-03-13 22:56:18 +00:00
repository.h Merge branch 'jh/builtin-fsmonitor-part2' 2022-04-04 10:56:24 -07:00
rerere.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
rerere.h
reset.c Merge branch 'pw/use-in-process-checkout-in-rebase' 2022-02-18 13:53:27 -08:00
reset.h rebase --apply: set ORIG_HEAD correctly 2022-01-26 12:08:53 -08:00
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jc/resolve-undo' 2022-07-19 16:40:16 -07:00
revision.h Merge branch 'ab/plug-leak-in-revisions' 2022-06-07 14:10:56 -07:00
run-command.c Merge branch 'js/wait-or-whine-can-fail' 2022-06-13 15:53:44 -07:00
run-command.h Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
SECURITY.md
send-pack.c send-pack.c: add config push.useBitmaps 2022-06-17 14:31:01 -07:00
send-pack.h send-pack.c: add config push.useBitmaps 2022-06-17 14:31:01 -07:00
sequencer.c Merge branch 'jc/revert-show-parent-info' 2022-06-15 15:09:27 -07:00
sequencer.h revert: optionally refer to commit in the "reference" format 2022-05-26 23:05:03 -07:00
serve.c serve.c: remove unnecessary include 2022-04-06 09:42:12 -07:00
serve.h serve.[ch]: remove "serve_options", split up --advertise-refs code 2021-08-05 08:59:37 -07:00
server-info.c *.c static functions: add missing __attribute__((format)) 2021-07-13 15:20:20 -07:00
setup.c Git 2.37.1 2022-07-11 16:08:49 -07:00
sh-i18n--envsubst.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'jt/unparse-commit-upon-graft-change' 2022-06-13 15:53:42 -07:00
shallow.h *.h: move some *_INIT to designated initializers 2021-09-27 14:48:00 -07:00
shared.mak cocci: add a "coccicheck-test" target and test *.cocci rules 2022-07-06 12:24:43 -07:00
shell.c
shortlog.h
sideband.c sideband: don't lose clear-to-eol at packet boundary 2021-06-17 14:11:36 +09:00
sideband.h
sigchain.c
sigchain.h
simple-ipc.h Merge branch 'jh/builtin-fsmonitor-part1' 2021-10-13 15:15:58 -07:00
sparse-index.c Merge branch 'ds/sparse-sparse-checkout' 2022-06-03 14:30:35 -07:00
sparse-index.h Merge branch 'ds/sparse-sparse-checkout' 2022-06-03 14:30:35 -07:00
split-index.c split-index: it really is incompatible with the sparse index 2022-01-23 17:06:23 -08:00
split-index.h
stable-qsort.c stable-qsort: avoid using potentially unaligned access 2022-01-07 15:48:40 -08:00
strbuf.c gettext API users: don't explicitly cast ngettext()'s "n" 2022-03-07 11:57:52 -08:00
strbuf.h strbuf.h: use BUG(...) not die("BUG: ...") 2021-12-07 12:31:16 -08:00
streaming.c object-file.c: stop dying in parse_loose_header() 2021-10-01 15:06:00 -07:00
streaming.h
string-list.c string-list.[ch]: remove string_list_init() compatibility function 2021-09-28 14:43:38 -07:00
string-list.h string-list API: change "nr" and "alloc" to "size_t" 2022-03-07 12:02:04 -08:00
strmap.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
strmap.h
strvec.c *.c *_init(): define in terms of corresponding *_INIT macro 2021-07-01 12:32:22 -07:00
strvec.h *.h: move some *_INIT to designated initializers 2021-09-27 14:48:00 -07:00
sub-process.c run-command API: remove "argv" member, always use "args" 2021-11-25 22:15:07 -08:00
sub-process.h
submodule-config.c i18n: fix mismatched camelCase config variables 2022-06-17 10:38:26 -07:00
submodule-config.h Merge branch 'pb/submodule-recurse-mode-enum' 2022-05-20 15:26:53 -07:00
submodule.c Merge branch 'ab/leakfix' 2022-07-18 13:31:54 -07:00
submodule.h Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
symlinks.c symlinks: do not include startup_info->original_cwd in dir removal 2021-12-09 13:33:13 -08:00
tag.c ssh signing: make verify-tag consider key lifetime 2021-12-09 13:38:04 -08:00
tag.h
tar.h
tempfile.c tempfile: add mks_tempfile_dt() 2022-04-20 16:17:33 -07:00
tempfile.h tempfile: add mks_tempfile_dt() 2022-04-20 16:17:33 -07:00
thread-utils.c
thread-utils.h
tmp-objdir.c log: clean unneeded objects during log --remerge-diff 2022-02-02 10:02:27 -08:00
tmp-objdir.h log: clean unneeded objects during log --remerge-diff 2022-02-02 10:02:27 -08:00
trace2.c common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trace2.h common-main.c: move non-trace2 exit() behavior out of trace2.c 2022-06-02 12:51:30 -07:00
trace.c C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trace.h C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code 2022-02-21 19:14:19 -08:00
trailer.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
trailer.h
transport-helper.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
transport-internal.h transport: rename "fetch" in transport_vtable to "fetch_refs" 2021-08-05 08:59:36 -07:00
transport.c Merge branch 'fh/transport-push-leakfix' 2022-06-07 14:10:57 -07:00
transport.h push: new config option "push.autoSetupRemote" supports "simple" push 2022-04-29 11:20:55 -07:00
tree-diff.c pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>) 2021-12-07 12:31:17 -08:00
tree-walk.c object-file API: pass an enum to read_object_with_reference() 2022-02-25 17:16:32 -08:00
tree-walk.h
tree.c
tree.h
unicode-width.h unicode: update the width tables to Unicode 14 2021-09-17 17:26:21 -07:00
unimplemented.sh unimplemented.sh: use the $( ... ) construct for command substitution 2015-12-27 15:33:13 -08:00
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'jh/builtin-fsmonitor-part3' 2022-06-10 15:04:15 -07:00
unpack-trees.h unpack-trees: refuse to remove startup_info->original_cwd 2021-12-09 13:33:12 -08:00
upload-pack.c upload-pack: look up "want" lines via commit-graph 2022-03-01 10:13:45 -08:00
upload-pack.h serve.[ch]: remove "serve_options", split up --advertise-refs code 2021-08-05 08:59:37 -07:00
url.c
url.h
urlmatch.c urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
urlmatch.h urlmatch.c: add and use a *_release() function 2022-03-04 13:24:18 -08:00
usage.c i18n: mark message helpers prefix for translation 2022-06-21 10:06:54 -07:00
userdiff.c Merge branch 'jd/userdiff-kotlin' 2022-03-23 14:09:29 -07:00
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
wildmatch.h
worktree.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
worktree.h worktree: create init_worktree_config() 2022-02-08 09:49:20 -08:00
wrap-for-bin.sh
wrapper.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
write-or-die.c core.fsync: introduce granular fsync control infrastructure 2022-03-10 15:10:22 -08:00
ws.c
wt-status.c Merge branch 'ab/env-array' 2022-06-10 15:04:13 -07:00
wt-status.h status: skip sparse-checkout percentage with sparse-index 2021-07-14 13:42:49 -07:00
xdiff-interface.c Merge branch 'ep/maint-equals-null-cocci' for maint-2.35 2022-05-02 10:06:04 -07: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 and Documentation/CodingGuidelines).

Those wishing to help with error message, usage and informational message string translations (localization l10) should see po/README.md (a po file is a Portable Object file that holds the translations).

To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org (not the Git list). 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