1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-28 04:49:43 +01:00
Find a file
Junio C Hamano 4460e052e0 remerge-diff: clean up temporary objdir at a central place
After running a diff between two things, or a series of diffs while
walking the history, the diff computation is concluded by a call to
diff_result_code() to extract the exit status of the diff machinery.

The function can work on "struct diffopt", but all the callers
historically and currently pass "struct diffopt" that is embedded in
the "struct rev_info" that is used to hold the remerge_diff bit and
the remerge_objdir variable that points at the temporary object
directory in use.

Redefine diff_result_code() to take the whole "struct rev_info" to
give it an access to these members related to remerge-diff, so that
it can get rid of the temporary object directory for any and all
callers that used the feature.  We can lose the equivalent code to
do so from the code paths for individual commands, diff-tree, diff,
and log.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-08-09 15:42:40 -07:00
.github Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43 2024-05-24 16:58:11 -07:00
block-sha1
builtin remerge-diff: clean up temporary objdir at a central place 2024-08-09 15:42:40 -07:00
ci Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43 2024-05-24 16:58:11 -07:00
compat Merge branch 'jh/fsmonitor-darwin-modernize' 2024-04-16 23:55:55 +02:00
contrib Merge branch 'sh/completion-with-reftable' into maint-2.43 2024-02-08 16:22:04 -08:00
Documentation Git 2.43.5 2024-05-30 17:06:24 -07:00
ewah git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
git-gui Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
gitk-git doc: switch links to https 2023-11-26 10:07:05 +09:00
gitweb Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
mergetools
negotiator treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
oss-fuzz object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
perl Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
po Merge branch 'l10n/zh-TW/2023-11-19' of github.com:l10n-tw/git-po 2023-11-20 07:57:09 +08:00
refs treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
reftable Merge branch 'jc/comment-style-fixes' into maint-2.43 2024-02-13 14:44:48 -08:00
sha1 avoid SHA-1 functions deprecated in OpenSSL 3+ 2023-08-01 08:34:56 -07:00
sha1collisiondetection@855827c583
sha1dc doc: refer to internet archive 2023-11-26 10:07:06 +09:00
sha256 Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
t diff-tree: fix crash when used with --remerge-diff 2024-08-09 08:07:44 -07:00
templates Merge branch 'jp/use-diff-index-in-pre-commit-sample' into maint-2.43 2024-02-08 16:22:02 -08:00
trace2 Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
xdiff
.cirrus.yml
.clang-format clang-format: fix typo in comment 2023-11-01 12:24:19 +09:00
.editorconfig
.gitattributes
.gitignore gitignore: ignore clangd .cache directory 2023-08-04 10:56:51 -07:00
.gitlab-ci.yml ci: add support for GitLab CI 2023-11-09 18:56:10 +09:00
.gitmodules
.mailmap mailmap: change primary address for Derrick Stolee 2023-10-12 10:59:36 -07:00
.tsan-suppressions
abspath.c abspath: move related functions to abspath 2023-06-12 13:49:35 -07:00
abspath.h abspath: move related functions to abspath 2023-06-12 13:49:35 -07:00
aclocal.m4
add-interactive.c Merge branch 'jk/unused-post-2.42' 2023-09-07 15:06:07 -07:00
add-interactive.h
add-patch.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
advice.c advice: handle "rebase" in error_resolve_conflict() 2023-08-07 13:21:00 -07:00
advice.h worktree add: introduce "try --orphan" hint 2023-05-17 15:55:24 -07:00
alias.c Merge branch 'cw/compat-util-header-cleanup' 2023-07-17 11:30:42 -07:00
alias.h
alloc.c hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
alloc.h git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
apply.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
apply.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
archive-tar.c archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
archive-zip.c archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
archive.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
archive.h archive.h: remove unnecessary include 2023-12-26 12:04:31 -08:00
attr.c Merge branch 'jc/attr-tree-config' 2023-10-30 07:09:55 +09:00
attr.h attr: add attr.tree for setting the treeish to read attributes from 2023-10-13 11:43:29 -07:00
banned.h banned.h: mark strtok() and strtok_r() as banned 2023-04-27 08:51:11 -07:00
base85.c base85.h: move declarations for base85.c functions from cache.h 2023-04-24 12:47:32 -07:00
base85.h base85.h: move declarations for base85.c functions from cache.h 2023-04-24 12:47:32 -07:00
bisect.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bisect.h
blame.c blame.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
blame.h blame.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
blob.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
blob.h
bloom.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bloom.h
branch.c Merge branch 'rj/status-bisect-while-rebase' into maint-2.43 2024-02-08 16:22:04 -08:00
branch.h
builtin.h builtin.h: remove unneccessary includes 2023-06-21 13:39:54 -07:00
bulk-checkin.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bulk-checkin.h bulk-checkin: only support blobs in index_bulk_checkin 2023-09-26 10:17:56 -07:00
bundle-uri.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
bundle-uri.h
bundle.c Merge branch 'dk/bundle-i18n-more' 2023-07-25 12:05:24 -07:00
bundle.h
cache-tree.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
cache-tree.h
cbtree.c
cbtree.h
chdir-notify.c
chdir-notify.h
check-builtins.sh
checkout.c hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
checkout.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
chunk-format.c chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
chunk-format.h chunk-format: drop pair_chunk_unsafe() 2023-10-09 15:55:02 -07:00
CODE_OF_CONDUCT.md CoC: whitespace fix 2024-01-23 10:40:10 -08:00
color.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
color.h config: inline git_color_default_config 2023-06-28 14:06:38 -07:00
column.c
column.h
combine-diff.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
command-list.txt
commit-graph.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
commit-graph.h Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence' 2023-11-08 11:03:59 +09:00
commit-reach.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
commit.h commit: ignore_non_trailer computes number of bytes to ignore 2023-10-20 14:25:12 -07:00
common-main.c treewide: remove cache.h inclusion due to previous changes 2023-04-24 12:47:33 -07:00
config.c Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43 2024-05-24 16:58:11 -07:00
config.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
config.mak.dev
config.mak.in
config.mak.uname win32: add a helper to run git.exe without a foreground window 2023-08-09 13:58:13 -07:00
configure.ac configure.ac: always save NO_ICONV to config.status 2023-07-19 10:07:55 -07:00
connect.c Merge branch 'gc/config-context' 2023-07-06 11:54:48 -07:00
connect.h
connected.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
connected.h
convert.c Merge branch 'cw/compat-util-header-cleanup' 2023-07-17 11:30:42 -07:00
convert.h config: use git_config_string() for core.checkRoundTripEncoding 2023-12-09 08:26:22 +09:00
copy.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
copy.h Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
COPYING
credential.c credential: mark unused parameter in urlmatch callback 2023-08-29 17:56:26 -07:00
credential.h credential: avoid erasing distinct password 2023-06-15 13:26:39 -07:00
csum-file.c Merge branch 'ew/hash-with-openssl-evp' 2023-09-13 10:07:57 -07:00
csum-file.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
ctype.c kwset: move translation table from ctype 2023-07-05 11:41:18 -07:00
daemon.c daemon: free listen_addr before returning 2023-10-05 14:54:58 -07:00
date.c Merge branch 'en/header-split-cache-h-part-2' 2023-05-09 16:45:46 -07:00
date.h
decorate.c decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
decorate.h decorate: add clear_decoration() function 2023-10-05 14:54:55 -07:00
delta-islands.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
delta-islands.h
delta.h
detect-compiler Handle some compiler versions containing a dash 2023-04-26 09:20:50 -07:00
diagnose.c dir.[ch]: add 'follow_symlink' arg to 'get_dtype' 2023-10-09 15:53:13 -07:00
diagnose.h
diff-delta.c
diff-lib.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diff-merges.c diff-merges: introduce '--dd' option 2023-10-09 12:47:29 -07:00
diff-merges.h
diff-no-index.c remerge-diff: clean up temporary objdir at a central place 2024-08-09 15:42:40 -07:00
diff.c remerge-diff: clean up temporary objdir at a central place 2024-08-09 15:42:40 -07:00
diff.h remerge-diff: clean up temporary objdir at a central place 2024-08-09 15:42:40 -07:00
diffcore-break.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
diffcore-delta.c Merge branch 'en/diffcore-delta-final-line-fix' into maint-2.43 2024-02-13 14:44:48 -08:00
diffcore-order.c git-compat-util.h: remove unneccessary include of wildmatch.h 2023-06-21 13:39:54 -07:00
diffcore-pickaxe.c diff.h: remove unnecessary include of oidset.h 2023-06-21 13:39:53 -07:00
diffcore-rename.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
diffcore-rotate.c
diffcore.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
dir-iterator.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
dir-iterator.h
dir.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
dir.h Sync with 2.42.2 2024-04-19 12:38:50 +02:00
editor.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -07:00
editor.h
entry.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
entry.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
environment.c config: use git_config_string() for core.checkRoundTripEncoding 2023-12-09 08:26:22 +09:00
environment.h add core.maxTreeDepth config 2023-08-31 15:51:07 -07:00
exec-cmd.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'sd/negotiate-trace-fix' into maint-2.43 2024-02-13 14:44:50 -08:00
fetch-pack.h treewide: remove unnecessary includes from header files 2023-12-26 12:04:31 -08:00
fmt-merge-msg.c Merge branch 'cw/compat-util-header-cleanup' 2023-07-17 11:30:42 -07:00
fmt-merge-msg.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
fsck.c Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43 2024-05-24 16:58:11 -07:00
fsck.h Merge branch 'fixes/2.45.1/2.42' into fixes/2.45.1/2.43 2024-05-24 16:58:11 -07:00
fsmonitor--daemon.h fsmonitor--daemon.h: remove unnecessary includes 2023-12-26 12:04:32 -08:00
fsmonitor-ipc.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:33 -08:00
fsmonitor-ipc.h
fsmonitor-ll.h fsmonitor-ll.h: split this header out of fsmonitor.h 2023-06-21 13:39:54 -07:00
fsmonitor-path-utils.h
fsmonitor-settings.c fsmonitor: mark some maybe-unused parameters 2023-09-18 15:56:14 -07:00
fsmonitor-settings.h
fsmonitor.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
fsmonitor.h fsmonitor-ll.h: split this header out of fsmonitor.h 2023-06-21 13:39:54 -07:00
generate-cmdlist.sh
generate-configlist.sh
generate-hooklist.sh
gettext.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
gettext.h
git-archimport.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-compat-util.h Merge branch 'mp/rebase-label-length-limit' into maint-2.42 2023-11-02 16:53:14 +09:00
git-curl-compat.h remote-curl: add Transfer-Encoding header only for older curl 2024-04-10 19:24:48 +02:00
git-cvsexportcommit.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-cvsimport.perl Merge branch 'js/update-urls-in-doc-and-comment' into maint-2.43 2024-02-08 16:22:01 -08:00
git-cvsserver.perl perl: bump the required Perl version to 5.8.1 from 5.8.0 2023-11-17 07:26:32 +09:00
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh doc: switch links to https 2023-11-26 10:07:05 +09:00
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py git-p4: use raw string literals for regular expressions 2024-01-29 09:25:16 -08:00
git-quiltimport.sh
git-request-pull.sh
git-send-email.perl Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl Merge branch 'tz/send-email-negatable-options' into maint-2.43 2024-02-08 16:22:01 -08:00
GIT-VERSION-GEN Git 2.43.5 2024-05-30 17:06:24 -07:00
git-web--browse.sh
git-zlib.c
git-zlib.h
git.c Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
git.rc
gpg-interface.c Merge branch 'jc/sign-buffer-failure-propagation-fix' into maint-2.43 2024-02-13 14:44:48 -08:00
gpg-interface.h tag: fix sign_buffer() call to create a signed tag 2024-02-07 10:47:25 -08:00
graph.c diff --stat: add config option to limit filename width 2023-09-18 09:39:07 -07:00
graph.h doc: switch links to https 2023-11-26 10:07:05 +09:00
grep.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
grep.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
hash-ll.h Merge branch 'ew/hash-with-openssl-evp' 2023-08-09 16:18:15 -07:00
hash-lookup.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
hash-lookup.h
hash.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
hashmap.c
hashmap.h hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
help.c help: handle NULL value for alias.* config 2023-12-09 08:24:47 +09:00
help.h
hex-ll.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex-ll.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hex.h hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
hook.c Merge branch 'fixes/2.45.1/2.41' into fixes/2.45.1/2.42 2024-05-24 16:57:43 -07:00
hook.h
http-backend.c Merge branch 'tb/refs-exclusion-and-packed-refs' 2023-07-21 13:47:26 -07:00
http-fetch.c http.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
http-push.c http.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
http-walker.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
http.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
http.h http.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
ident.c Merge branch 'bc/ident-dot-is-no-longer-crud-letter' 2023-08-09 16:18:15 -07:00
ident.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
imap-send.c Merge branch 'pb/imap-send-wo-curl-build-fix' into maint-2.43 2024-02-12 09:57:59 -08:00
INSTALL Sync with 2.42.2 2024-04-19 12:38:50 +02:00
iterator.h
json-writer.c
json-writer.h doc: switch links to https 2023-11-26 10:07:05 +09:00
khash.h hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
kwset.c doc: switch links to https 2023-11-26 10:07:05 +09:00
kwset.h doc: switch links to https 2023-11-26 10:07:05 +09:00
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:33 -08:00
line-log.h line-log.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
line-range.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
list-objects-filter-options.h list-objects-filter-options.h: remove unneccessary include 2023-06-21 13:39:53 -07:00
list-objects-filter.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
list-objects-filter.h
list-objects.c Merge branch 'tb/rev-list-unpacked-fix' 2023-11-08 15:04:42 +09:00
list-objects.h
list.h doc: switch links to https 2023-11-26 10:07:05 +09:00
lockfile.c
lockfile.h
log-tree.c remerge-diff: lazily prepare temporary objdir on demand 2024-08-09 15:42:35 -07:00
log-tree.h pretty: add pointer and tag options to %(decorate) 2023-08-21 11:40:10 -07:00
ls-refs.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
ls-refs.h
mailinfo.c Merge branch 'jk/mailinfo-iterative-unquote-comment' into maint-2.43 2024-02-08 16:22:03 -08:00
mailinfo.h
mailmap.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
mailmap.h
Makefile Merge branch 'fixes/2.45.1/2.40' into fixes/2.45.1/2.41 2024-05-24 16:57:02 -07:00
match-trees.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
match-trees.h match-trees.h: move declarations for match-trees.c functions from cache.h 2023-04-24 12:47:32 -07:00
mem-pool.c
mem-pool.h
merge-blobs.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
merge-blobs.h
merge-ll.c config: use config_error_nonbool() instead of custom messages 2023-12-09 08:26:22 +09:00
merge-ll.h merge-ll: rename from ll-merge 2023-06-21 13:39:54 -07:00
merge-ort-wrappers.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
merge-ort-wrappers.h
merge-ort.c Merge branch 'jc/comment-style-fixes' into maint-2.43 2024-02-13 14:44:48 -08:00
merge-ort.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
merge-recursive.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
merge-recursive.h merge: introduce {copy|clear}_merge_options() 2023-10-11 13:37:47 -07:00
merge.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
merge.h merge.h: move declarations for merge.c from cache.h 2023-06-21 13:39:53 -07:00
mergesort.h
midx.c midx: check size of revindex chunk 2023-10-09 15:55:01 -07:00
midx.h treewide: remove unnecessary includes from header files 2023-12-26 12:04:31 -08:00
name-hash.c cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
name-hash.h name-hash.h: move declarations for name-hash.c from cache.h 2023-06-21 13:39:53 -07:00
notes-cache.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
notes-cache.h
notes-merge.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -07:00
notes-merge.h
notes-utils.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
notes-utils.h
notes.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
notes.h notes: move the documentation to the struct 2023-06-06 09:35:05 +09:00
object-file.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
object-file.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
object-name.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
object-name.h object-name: move related functions to object-name 2023-06-12 13:49:36 -07:00
object-store-ll.h Merge branch 'tb/object-access-overflow-protection' 2023-07-25 12:05:23 -07:00
object-store.h packfile.c: prevent overflow in load_idx() 2023-07-14 09:31:34 -07:00
object.c Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
object.h Merge branch 'tb/pack-bitmap-traversal-with-boundary' 2023-06-22 16:29:05 -07:00
oid-array.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
oid-array.h
oidmap.c hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
oidmap.h read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
oidset.c
oidset.h
oidtree.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
oidtree.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
pack-bitmap-write.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
pack-bitmap.c pack-bitmap: drop unused reuse_objects 2024-01-29 09:26:17 -08:00
pack-bitmap.h Merge branch 'tb/pack-bitmap-traversal-with-boundary' 2023-06-22 16:29:05 -07:00
pack-check.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
pack-mtimes.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
pack-mtimes.h
pack-objects.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
pack-objects.h object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
pack-revindex.c Merge branch 'jk/chunk-bounds' 2023-10-23 13:56:36 -07:00
pack-revindex.h
pack-write.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
pack.h
packfile.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
packfile.h packfile.c: fix a typo in each_file_in_pack_dir_fn()'s declaration 2023-11-20 08:15:50 +09:00
pager.c config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
pager.h
parallel-checkout.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
parallel-checkout.h
parse-options-cb.c parse-options: mark unused parameters in noop callback 2023-09-05 14:48:17 -07:00
parse-options.c Merge branch 'rs/parse-options-with-keep-unknown-abbrev-fix' into maint-2.43 2024-02-13 14:44:48 -08:00
parse-options.h parse-options: make CMDMODE errors more precise 2023-10-29 09:15:18 +09:00
parse.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
parse.h parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
patch-delta.c
patch-ids.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
patch-ids.h
path.c Sync with 2.41.1 2024-04-19 12:38:46 +02:00
path.h path: move related function to path 2023-06-12 13:49:36 -07:00
pathspec.c grep: die gracefully when outside repository 2023-10-20 11:06:45 -07:00
pathspec.h Merge branch 'jk/log-follow-with-non-literal-pathspec' 2023-06-20 15:53:13 -07:00
pkt-line.c Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 2024-02-08 16:22:11 -08:00
pkt-line.h Merge branch 'jx/sideband-chomp-newline-fix' into maint-2.43 2024-02-08 16:22:11 -08:00
preload-index.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
preload-index.h preload-index.h: move declarations for preload-index.c from elsewhere 2023-06-21 13:39:53 -07:00
pretty.c pretty: fix ref filtering for %(decorate) formats 2023-10-09 11:25:13 -07:00
pretty.h
prio-queue.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
prio-queue.h
progress.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
progress.h
promisor-remote.c Sync with 2.41.1 2024-04-19 12:38:46 +02:00
promisor-remote.h
prompt.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
prompt.h
protocol-caps.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
protocol-caps.h
protocol.c
protocol.h doc: switch links to https 2023-11-26 10:07:05 +09:00
prune-packed.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
prune-packed.h
quote.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
quote.h
range-diff.c Merge branch 'kh/range-diff-notes' 2023-09-29 09:04:15 -07:00
range-diff.h
reachable.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
reachable.h
read-cache-ll.h read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
read-cache.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
read-cache.h read-cache*.h: move declarations for read-cache.c functions from cache.h 2023-06-21 13:39:53 -07:00
README.md Merge branch 'jc/majordomo-to-subspace' into maint-2.43 2024-02-13 14:44:50 -08:00
rebase-interactive.c Merge branch 'cw/compat-util-header-cleanup' 2023-07-17 11:30:42 -07:00
rebase-interactive.h
rebase.c parse: separate out parsing functions from config.h 2023-09-29 15:14:57 -07:00
rebase.h
ref-filter.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
ref-filter.h treewide: remove unnecessary includes from header files 2023-12-26 12:04:31 -08:00
reflog-walk.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
reflog-walk.h
reflog.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
reflog.h
refs.c Merge branch 'jk/unused-parameter' 2023-07-25 12:05:24 -07:00
refs.h refs.h: HEAD is not that special 2023-12-15 14:08:28 -08:00
refspec.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
refspec.h
RelNotes Git 2.43.5 2024-05-30 17:06:24 -07:00
remote-curl.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
remote.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
remote.h Merge branch 'jc/retire-cas-opt-name-constant' into maint-2.43 2024-02-08 16:22:09 -08:00
replace-object.c Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
replace-object.h Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
repo-settings.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:33 -08:00
repository.c Sync with 2.41.1 2024-04-19 12:38:46 +02:00
repository.h Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
rerere.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
rerere.h
reset.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
reset.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
resolve-undo.c Merge branch 'jc/unresolve-removal' 2023-10-02 11:20:00 -07:00
resolve-undo.h checkout: allow "checkout -m path" to unmerge removed paths 2023-07-31 16:16:44 -07:00
revision.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
revision.h rev-list: add commit object support in --missing option 2023-11-01 12:07:18 +09:00
run-command.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
run-command.h cache.h: remove this no-longer-used header 2023-06-21 13:39:53 -07:00
sane-ctype.h sane-ctype.h: create header for sane-ctype macros 2023-07-05 11:41:18 -07:00
scalar.c Merge branch 'ds/scalar-updates' into maint-2.42 2023-11-02 16:53:15 +09:00
SECURITY.md
send-pack.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
send-pack.h
sequencer.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
sequencer.h
serve.c hash-ll, hashmap: move oidhash() to hash-ll 2023-06-21 13:39:54 -07:00
serve.h
server-info.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
server-info.h server-info.h: move declarations for server-info.c functions from cache.h 2023-04-24 12:47:31 -07:00
setup.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
setup.h Sync with 2.41.1 2024-04-19 12:38:46 +02:00
sh-i18n--envsubst.c doc: switch links to https 2023-11-26 10:07:05 +09:00
sha1dc_git.c
sha1dc_git.h
shallow.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
shallow.h
shared.mak
shell.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
shortlog.h
sideband.c Merge branch 'cp/sideband-array-index-comment-fix' into maint-2.43 2024-02-08 16:22:12 -08:00
sideband.h
sigchain.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
sigchain.h
simple-ipc.h
sparse-index.c read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
sparse-index.h sparse-index.h: move declarations for sparse-index.c from cache.h 2023-06-21 13:39:53 -07:00
split-index.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
split-index.h hash-ll.h: split out of hash.h to remove dependency on repository.h 2023-04-24 12:47:32 -07:00
stable-qsort.c
statinfo.c Prevent git from rehashing 4GiB files 2023-10-13 13:33:35 -07:00
statinfo.h Merge branch 'en/header-split-cache-h-part-3' 2023-06-29 16:43:21 -07:00
strbuf.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
strbuf.h doc: fix some typos, grammar and wording issues 2023-10-05 12:55:38 -07:00
streaming.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -07:00
streaming.h
string-list.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
string-list.h string-list: introduce string_list_setlen() 2023-04-24 16:01:28 -07:00
strmap.c
strmap.h
strvec.c strvec: drop unnecessary include of hex.h 2023-11-03 08:26:55 +09:00
strvec.h strvec: use correct member name in comments 2024-01-12 13:38:07 -08:00
sub-process.c
sub-process.h
submodule-config.c submodule: handle NULL value when parsing submodule.*.branch 2023-12-09 08:24:47 +09:00
submodule-config.h submodule-config.h: remove unnecessary include 2023-12-26 12:04:32 -08:00
submodule.c Sync with 2.42.2 2024-04-19 12:38:50 +02:00
submodule.h Sync with 2.39.4 2024-04-19 12:38:37 +02:00
symlinks.c symlinks.h: move declarations for symlinks.c functions from cache.h 2023-04-24 12:47:31 -07:00
symlinks.h symlinks.h: move declarations for symlinks.c functions from cache.h 2023-04-24 12:47:31 -07:00
tag.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -07:00
tag.h
tar.h
tempfile.c Merge branch 'cw/compat-util-header-cleanup' 2023-07-17 11:30:42 -07:00
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
tmp-objdir.h
trace.c doc: switch links to https 2023-11-26 10:07:05 +09:00
trace.h
trace2.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
trace2.h trace2: fix signature of trace2_def_param() macro 2023-11-23 10:30:32 +09:00
trailer.c Merge branch 'la/trailer-cleanups' into maint-2.43 2024-02-22 16:09:45 -08:00
trailer.h trailer: use offsets for trailer_start/trailer_end 2023-12-20 11:55:04 -08:00
transport-helper.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
transport-internal.h
transport.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
transport.h
tree-diff.c tree-diff: respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.c traverse_trees(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
tree-walk.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
tree.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
tree.h read_tree(): respect max_allowed_tree_depth 2023-08-31 15:51:08 -07:00
unicode-width.h unicode: update the width tables to Unicode 15.1 2023-09-25 16:17:28 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unix-stream-server.c
unix-stream-server.h
unpack-trees.c Merge branch 'cw/prelim-cleanup' 2023-10-10 11:39:14 -07:00
unpack-trees.h tree-walk: drop MAX_TRAVERSE_TREES macro 2023-08-31 15:51:07 -07:00
upload-pack.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
upload-pack.h
url.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
url.h
urlmatch.c hex-ll: separate out non-hash-algo functions 2023-09-29 15:14:56 -07:00
urlmatch.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00
usage.c treewide: remove unnecessary includes for wrapper.h 2023-07-05 11:41:59 -07:00
userdiff.c git-compat-util: move alloc macros to git-compat-util.h 2023-07-05 11:42:31 -07:00
userdiff.h Merge branch 'rs/userdiff-multibyte-regex' 2023-04-20 14:33:35 -07:00
utf8.c doc: switch links to https 2023-11-26 10:07:05 +09:00
utf8.h doc: switch links to https 2023-11-26 10:07:05 +09:00
varint.c
varint.h
version.c
version.h
versioncmp.c git-compat-util: move strbuf.c funcs to its header 2023-07-05 11:41:18 -07:00
versioncmp.h versioncmp.h: move declarations for versioncmp.c functions from cache.h 2023-04-24 12:47:32 -07:00
walker.c object-store-ll.h: split this header out of object-store.h 2023-06-21 13:39:54 -07:00
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'rj/status-bisect-while-rebase' into maint-2.43 2024-02-08 16:22:04 -08:00
worktree.h
wrap-for-bin.sh
wrapper.c treewide: remove unnecessary includes in source files 2023-12-26 12:04:31 -08:00
wrapper.h wrapper: reduce scope of remove_or_warn() 2023-09-29 15:14:56 -07:00
write-or-die.c write-or-die: fix the polarity of GIT_FLUSH environment variable 2024-02-13 11:57:28 -08:00
write-or-die.h
ws.c Merge branch 'jc/attr-source-tree' 2023-05-17 10:11:41 -07:00
ws.h ws.h: move declarations for ws.c functions from cache.h 2023-04-24 12:47:32 -07:00
wt-status.c remerge-diff: clean up temporary objdir at a central place 2024-08-09 15:42:40 -07:00
wt-status.h status: fix branch shown when not only bisecting 2023-10-16 15:05:27 -07:00
xdiff-interface.c Merge branch 'en/header-cleanup' into maint-2.43 2024-02-08 16:22:10 -08:00
xdiff-interface.h config: add ctx arg to config_fn_t 2023-06-28 14:06:39 -07:00

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 to git+subscribe@vger.kernel.org (see https://subspace.kernel.org/subscribing.html for details). The mailing list archives are available at https://lore.kernel.org/git/, https://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