A fork of Git containing Microsoft-specific patches.
Перейти к файлу
Han-Wen Nienhuys 71e5473493 refs: unify parse_worktree_ref() and ref_type()
The logic to handle worktree refs (worktrees/NAME/REF and
main-worktree/REF) existed in two places:

* ref_type() in refs.c

* parse_worktree_ref() in worktree.c

Collapse this logic together in one function parse_worktree_ref():
this avoids having to cross-check the result of parse_worktree_ref()
and ref_type().

Introduce enum ref_worktree_type, which is slightly different from
enum ref_type. The latter is a misleading name (one would think that
'ref_type' would have the symref option).

Instead, enum ref_worktree_type only makes explicit how a refname
relates to a worktree. From this point of view, HEAD and
refs/bisect/abc are the same: they specify the current worktree
implicitly.

The files-backend must avoid packing refs/bisect/* and friends into
packed-refs, so expose is_per_worktree_ref() separately.

Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-09-19 11:11:11 -07:00
.github ci: update 'static-analysis' to Ubuntu 22.04 2022-08-24 13:02:12 -07:00
Documentation Git 2.38-rc0 2022-09-15 16:09:47 -07:00
block-sha1 Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -07:00
builtin refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
ci CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks 2022-07-27 16:35:40 -07:00
compat Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
contrib Merge branch 'jd/prompt-show-conflict' 2022-08-29 14:55:12 -07:00
ewah Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
git-gui Merge https://github.com/prati0100/git-gui 2021-03-04 12:38:50 -08:00
gitk-git Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk 2022-05-11 08:25:02 -07:00
gitweb Merge branch 'jr/gitweb-title-shortening' 2022-08-05 15:52:14 -07:00
mergetools mergetools: vimdiff: simplify tabfirst 2022-08-10 12:39:39 -07:00
negotiator git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
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
refs refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
reftable reftable: drop unused parameter from reader_seek_linear() 2022-08-20 14:14:55 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256 sha256: add support for Nettle 2022-07-10 14:43:34 -07:00
t Merge branch 'jk/proto-v2-ref-prefix-fix' 2022-09-15 16:09:47 -07:00
templates fsmonitor: query watchman with right valid json 2022-06-07 10:00:49 -07:00
trace2 tr2: shows scope unconditionally in addition to key-value pair 2022-08-11 21:05:00 -07:00
xdiff xdiff: drop unused mmfile parameters from xdl_do_patience_diff() 2022-08-20 14:14:55 -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 CoC: explicitly take any whitespace breakage 2021-01-04 09:44:49 -08:00
.gitignore builtin/diagnose.c: create 'git diagnose' builtin 2022-08-12 13:20:02 -07:00
.gitmodules
.mailmap mailmap: change primary address for Derrick Stolee 2022-02-14 13:27:31 -08:00
.tsan-suppressions
CODE_OF_CONDUCT.md CODE_OF_CONDUCT.md: update PLC members list 2022-02-18 12:36:29 -08:00
COPYING
GIT-VERSION-GEN Git 2.38-rc0 2022-09-15 16:09:47 -07:00
INSTALL Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -07:00
LGPL-2.1
Makefile Merge branch 'ab/submodule-helper-prep' 2022-09-13 11:38:23 -07:00
README.md Merge branch 'po/readme-mention-contributor-hints' 2022-02-09 14:20:59 -08:00
RelNotes Merge a handful of topics from the 'master' front 2022-09-13 12:22:59 -07:00
SECURITY.md SECURITY: describe how to report vulnerabilities 2021-03-27 15:13:02 -07:00
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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
add-interactive.h
add-patch.c Merge branch 'rs/add-p-worktree-mode-prompt-fix' 2022-09-15 16:09:46 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
archive-zip.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
archive.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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/unused-annotation' 2022-09-14 12:56:39 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 'rs/mergesort' 2022-08-03 13:36:09 -07:00
blame.h
blob.c
blob.h
bloom.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
bloom.h
branch.c branch: consider refs under 'update-refs' 2022-07-19 12:49:03 -07:00
branch.h Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref 2022-07-12 08:38:42 -07:00
builtin.h builtin/diagnose.c: create 'git diagnose' builtin 2022-08-12 13:20:02 -07:00
bulk-checkin.c t5351: avoid relying on `core.fsyncMethod = batch` to be supported 2022-07-29 09:08:57 -07:00
bulk-checkin.h core.fsyncmethod: batched disk flushes for loose-objects 2022-04-06 13:13:01 -07:00
bundle-uri.c bundle-uri: add support for http(s):// and file:// 2022-08-10 14:07:37 -07:00
bundle-uri.h bundle-uri: create basic file-copy logic 2022-08-10 14:07:37 -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 verify_one_sparse(): drop unused parameters 2022-08-20 14:14:17 -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/decorate-filter-tweak' 2022-08-29 14:55:11 -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
color.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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' into maint 2022-07-27 13:00:32 -07:00
command-list.txt docs: move http-protocol docs to man section 5 2022-08-04 14:12:24 -07:00
commit-graph.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
commit-graph.h Merge branch 'tb/commit-graph-genv2-upgrade-fix' 2022-08-03 13:36:08 -07: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
commit-slab-impl.h
commit-slab.h
commit.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
config.h config: learn `git_protected_config()` 2022-07-14 15:08:29 -07:00
config.mak.dev config.mak.dev: squelch -Wno-missing-braces for older gcc 2022-07-31 11:50:07 -07:00
config.mak.in
config.mak.uname mingw: remove unneeded `NO_CURL` directive 2022-07-29 09:48:17 -07:00
configure.ac Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
convert.h checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
copy.c
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 daemon: clarify directory arguments 2022-07-19 12:45:31 -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 use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
decorate.h
delta-islands.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
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
diagnose.c builtin/diagnose.c: add '--mode' option 2022-08-12 13:20:02 -07:00
diagnose.h builtin/diagnose.c: add '--mode' option 2022-08-12 13:20:02 -07:00
diff-delta.c
diff-lib.c oneway_diff: handle removed sparse directories 2022-08-08 13:21:49 -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-no-index: simplify argv index calculation 2022-09-07 12:36:43 -07:00
diff.c Merge branch 'en/remerge-diff-fixes' 2022-09-15 16:09:46 -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 xdiff-interface: replace discard_hunk_line() with a flag 2021-05-11 12:47:31 +09:00
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 diff: --{rotate,skip}-to=<path> 2021-02-16 09:30:42 -08:00
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.h
dir.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
dir.h match_pathname(): drop unused "flags" parameter 2022-08-19 12:20:56 -07:00
editor.c run-command API: rename "env_array" to "env" 2022-06-02 14:31:16 -07:00
entry.c checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
entry.h checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
environment.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
environment.h environment: make `getenv_safe()` a public function 2021-01-15 13:03:45 -08:00
exec-cmd.c
exec-cmd.h
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 'ab/unused-annotation' 2022-09-14 12:56:39 -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 fsck: actually detect bad file modes in trees 2022-08-10 14:26:27 -07:00
fsck.h fsck: downgrade tree badFilemode to "info" 2022-08-10 14:26:29 -07:00
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 commit-graph: pass repo_settings instead of repository 2022-07-14 15:42:17 -07:00
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 Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07: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 git-cvsserver: clarify directory list 2022-07-19 12:45:31 -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 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 mergetool: do not enable hideResolved by default 2021-03-13 15:30:29 -08:00
git-p4.py Merge branch 'kk/p4-client-name-encoding-fix' into maint 2022-08-10 21:52:33 -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-web--browse.sh
git.c Merge branch 'sg/parse-options-subcommand' 2022-09-01 13:40:18 -07:00
git.rc
gpg-interface.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 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 Makefile + hash.h: remove PPC_SHA1 implementation 2022-08-31 14:37:31 -07:00
hashmap.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
hashmap.h
help.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
help.h git docs: add a category for file formats, protocols and interfaces 2022-08-04 14:12:23 -07: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' into maint 2022-08-26 11:13:12 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
imap-send.c Merge branch 'bc/csprng-mktemps' 2022-04-06 15:21:59 -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
line-log.c use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
line-log.h
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 list_objects_filter_options: plug leak of filter_spec strings 2022-09-08 11:08:23 -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: 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: 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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
log-tree.h log-tree.h: remove unused function declarations 2021-10-01 14:39:46 -07:00
ls-refs.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07: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 am: learn to process quoted lines that ends with CRLF 2021-05-10 15:06:22 +09:00
mailmap.c Merge branch 'ep/maint-equals-null-cocci' 2022-05-20 15:26:59 -07:00
mailmap.h shortlog: remove unused(?) "repo-abbrev" feature 2021-01-12 14:04:42 -08: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
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/ort-unused-code-removal' 2022-08-29 14:55:14 -07:00
merge-ort.h merge-ort: optionally produce machine-readable output 2022-06-22 16:10:06 -07:00
merge-recursive.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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.h mergesort: remove llist_mergesort() 2022-07-17 15:20:39 -07:00
midx.c Merge branch 'ac/bitmap-lookup-table' 2022-09-05 18:33:39 -07:00
midx.h pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests 2022-08-26 10:13:54 -07:00
name-hash.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07: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 use CALLOC_ARRAY 2021-03-13 16:00:09 -08:00
notes-utils.h
notes.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
notes.h
object-file.c Merge branch 'hx/unpack-streaming' 2022-07-14 15:03:59 -07:00
object-name.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
object-store.h git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
object.c parse_object(): check commit-graph when skip_hash set 2022-09-07 12:27:02 -07:00
object.h parse_object(): allow skipping hash check 2022-09-07 12:18:57 -07:00
oid-array.c oid_pos(): access table through const pointers 2021-01-28 12:03:26 -08:00
oid-array.h *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom 2021-09-27 14:47:59 -07:00
oidmap.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
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 pack-bitmap-write: drop unused pack_idx_entry parameters 2022-08-28 13:23:37 -07:00
pack-bitmap.c pack-bitmap: prepare to read lookup table extension 2022-08-26 10:13:58 -07:00
pack-bitmap.h pack-bitmap: prepare to read lookup table extension 2022-08-26 10:13:58 -07: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 docs: move pack format docs to man section 5 2022-08-04 14:12:24 -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 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
packfile.h Merge branch 'tb/pack-revindex-on-disk-cleanup' 2021-12-15 09:39:50 -08:00
pager.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
parallel-checkout.c checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
parallel-checkout.h checkout: fix two bugs on the final count of updated entries 2022-07-14 10:19:28 -07:00
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: add support for parsing subcommands 2022-08-19 11:13:14 -07:00
parse-options.h parse-options: add support for parsing subcommands 2022-08-19 11:13:14 -07:00
patch-delta.c
patch-ids.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
patch-ids.h patch-ids: handle duplicate hashmap entries 2021-01-12 11:13:32 -08:00
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 pathspec.h: move pathspec_needs_expanded_index() from reset.c to here 2022-08-08 13:23:26 -07:00
pathspec.h pathspec.h: move pathspec_needs_expanded_index() from reset.c to here 2022-08-08 13:23:26 -07:00
pkt-line.c t0021: implementation the rot13-filter.pl script in C 2022-08-14 22:57:12 -07:00
pkt-line.h Merge branch 'mt/rot13-in-c' 2022-08-29 14:55:11 -07:00
preload-index.c preload-index: fix memleak 2022-08-22 15:08:30 -07:00
pretty.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -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 'sg/xcalloc-cocci-fix' into maint 2022-09-13 12:21:09 -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 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
range-diff.h Merge branch 'js/range-diff-one-side-only' 2021-02-17 17:21:41 -08:00
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 Merge branch 'vd/sparse-reset-checkout-fixes' into maint 2022-08-26 11:13:13 -07:00
rebase-interactive.c sequencer: rewrite update-refs as user edits todo list 2022-07-19 12:49:04 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
reflog.h reflog: libify delete reflog function and helpers 2022-03-02 15:24:47 -08:00
refs.c refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
refs.h refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
refspec.c refspec.c: use designated initializers for "struct refspec_item" 2022-02-24 15:59:53 -08:00
refspec.h docs: move protocol-related docs to man section 5 2022-08-04 14:12:23 -07:00
remote-curl.c remote-curl: add 'get' capability 2022-08-10 14:07:37 -07:00
remote.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
remote.h Merge branch 'rs/mergesort' 2022-08-03 13:36:09 -07:00
replace-object.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
replace-object.h
repo-settings.c Merge branch 'jk/plug-list-object-filter-leaks' 2022-09-14 12:56:40 -07:00
repository.c Merge branch 'ab/plug-random-leaks' 2022-03-13 22:56:18 +00:00
repository.h Merge branch 'ab/submodule-helper-prep' 2022-09-13 11:38:23 -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 Merge branch 'ds/sparse-index-protections' 2021-04-30 13:50:26 +09:00
resolve-undo.h
revision.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
revision.h Merge branch 'jc/format-patch-force-in-body-from' 2022-09-09 12:02:25 -07:00
run-command.c pipe_command(): mark stdin descriptor as non-blocking 2022-08-17 09:21:41 -07:00
run-command.h Merge branch 'ab/hooks-regression-fix' 2022-06-13 15:53:41 -07:00
send-pack.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
send-pack.h send-pack.c: add config push.useBitmaps 2022-06-17 14:31:01 -07:00
sequencer.c Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07:00
sequencer.h sequencer: rewrite update-refs as user edits todo list 2022-07-19 12:49:04 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
setup.c Merge branch 'js/safe-directory-plus' into maint 2022-08-26 11:13:12 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 builtins + test helpers: use return instead of exit() in cmd_* 2021-06-09 09:15:58 +09:00
shortlog.h shortlog: remove unused(?) "repo-abbrev" feature 2021-01-12 14:04:42 -08:00
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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
strbuf.h strbuf.h: use BUG(...) not die("BUG: ...") 2021-12-07 12:31:16 -08:00
streaming.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07: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 *.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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
sub-process.h
submodule-config.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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/unused-annotation' 2022-09-14 12:56:39 -07:00
submodule.h submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string() 2022-09-02 09:16:24 -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: update comment describing state transitions 2022-08-30 14:16:51 -07:00
tempfile.h tempfile: drop active flag 2022-08-30 14:16:49 -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
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
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
trailer.c git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 'jk/plug-list-object-filter-leaks' 2022-09-14 12:56:40 -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 tree-walk: add a mechanism for getting non-canonicalized modes 2022-08-10 14:26:25 -07:00
tree-walk.h tree-walk: add a mechanism for getting non-canonicalized modes 2022-08-10 14:26:25 -07:00
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 unicode: update the width tables to Unicode 14 2021-09-17 17:26:21 -07:00
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 Merge branch 'vd/sparse-reset-checkout-fixes' 2022-09-09 12:02:26 -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 Merge branch 'ab/unused-annotation' 2022-09-14 12:56:39 -07: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 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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -07:00
walker.h
wildmatch.c tree-wide: apply equals-null.cocci 2022-05-02 09:50:37 -07:00
wildmatch.h
worktree.c refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
worktree.h refs: unify parse_worktree_ref() and ref_type() 2022-09-19 11:11:11 -07:00
wrap-for-bin.sh
wrapper.c Merge branch 'jk/pipe-command-nonblock' 2022-08-25 14:42:32 -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 git-compat-util.h: use "UNUSED", not "UNUSED(var)" 2022-09-01 10:49:48 -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 xdiff-interface: replace discard_hunk_line() with a flag 2021-05-11 12:47:31 +09:00
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