Go to file

Jeff King 4cfc971a2b diff: don't use diff_options.use_color as a strict bool We disable --color-moved if color is not in use at all. This happens in diff_setup_done(), where we set options->color_moved to 0 if options->use_color is not true. But a strict boolean check here is not correct; use_color could be GIT_COLOR_UNKNOWN or GIT_COLOR_AUTO, both of which evaluate to true, even though we may later decide not to show colors. We should be using want_color() to convert that git_colorbool into a true boolean. As it turns out, this does not produce wrong output. Even though we go to the trouble to detect the moved lines, ultimately we get the color values from diff_get_color(), which does check want_color(). And so it returns the empty string for each color, and we "color" the result with nothing. So the output is correct, but there is a small but measurable performance cost to doing the line detection. E.g., in git.git before and after this patch (there are no colors shown because hyperfine redirects output to /dev/null): Benchmark 1: ./git.old log --no-merges -p --color-moved -1000 Time (mean ± σ): 1.019 s ± 0.013 s [User: 0.955 s, System: 0.064 s] Range (min … max): 1.005 s … 1.045 s 10 runs Benchmark 2: ./git.new log --no-merges -p --color-moved -1000 Time (mean ± σ): 982.9 ms ± 14.5 ms [User: 925.8 ms, System: 57.1 ms] Range (min … max): 965.1 ms … 1003.2 ms 10 runs Summary ./git.new log --no-merges -p --color-moved -1000 ran 1.04 ± 0.02 times faster than ./git.old log --no-merges -p --color-moved -1000 Note that the fix is not quite as simple as just calling want_color() from diff_setup_done(). There's a subtle timing issue that goes back to `daa0c3d971` (color: delay auto-color decision until point of use, 2011-08-17), the commit that adds want_color() in the first place. As discussed there, we must delay evaluating the colorbool value until all pager setup is complete. So instead, we'll leave the "color_moved" field intact in diff_setup_done(), and modify the point where it is evaluated. Fortunately there is only one such spot that controls whether we run any of the color-moved code at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2025-09-16 13:37:05 -07:00
.github	ci: use Meson's new `--slice` option	2025-07-11 09:56:34 -07:00
Documentation	Git 2.51-rc1	2025-08-07 08:48:57 -07:00
bin-wrappers	…
block-sha1	…
builtin	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
ci	Merge branch 'jc/ci-print-test-failures-fix'	2025-08-01 11:27:12 -07:00
compat	Merge branch 'js/mingw-fixes'	2025-08-04 08:10:34 -07:00
compiler-tricks	intialize false_but_the_compiler_does_not_know_it_	2025-05-07 09:11:47 -07:00
contrib	contrib/diff-highlight: mention interactive.diffFilter	2025-09-08 14:00:33 -07:00
ewah	ewah: implement `struct ewah_or_iterator`	2025-03-21 04:34:04 -07:00
git-gui	Merge branch 'master' of https://github.com/j6t/git-gui	2025-08-04 11:45:23 -07:00
gitk-git	Merge branch 'master' of https://github.com/j6t/gitk	2025-08-04 11:44:30 -07:00
gitweb	meson: distinguish build and target host binaries	2025-04-01 02:20:44 -07:00
mergetools	doc: update references to renamed AsciiDoc files	2025-06-06 15:05:47 -07:00
negotiator	…
oss-fuzz	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
perl	contrib: better support symbolic port names in git-credential-netrc	2025-06-25 09:43:59 -07:00
po	l10n: Update Catalan Translation for Git 2.51-rc2	2025-08-17 09:25:36 -04:00
refs	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
reftable	reftable: make REFTABLE_UNUSED C99 compatible	2025-05-29 09:18:53 -07:00
sha1	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
subprojects	meson: update subproject wrappers	2025-07-11 09:56:34 -07:00
t	add-interactive: manually fall back color config to color.ui	2025-09-08 14:00:32 -07:00
templates	meson: distinguish build and target host binaries	2025-04-01 02:20:44 -07:00
trace2	trace2: avoid "futile conditional"	2025-05-15 13:46:47 -07:00
xdiff	xdiff: disable cleanup_records heuristic with --minimal	2025-04-29 12:46:58 -07:00
.cirrus.yml	ci: update FreeBSD image to 14.3	2025-07-01 07:46:22 -07:00
.clang-format	clang-format: add 'RemoveBracesLLVM' to the main config	2025-07-02 09:05:29 -07:00
.editorconfig	editorconfig: add .bash extension	2025-03-03 08:39:47 -08:00
.gitattributes	git-gui: wire up support for the Meson build system	2025-05-13 08:48:09 +02:00
.gitignore	git-gui: honor TCLTK_PATH in git-gui--askpass	2025-07-31 18:42:54 +02:00
.gitlab-ci.yml	ci: use Meson's new `--slice` option	2025-07-11 09:56:34 -07:00
.gitmodules	…
.mailmap	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-BUILD-OPTIONS.in	GIT-BUILD-OPTIONS: propagate project's source directory	2025-02-18 11:40:02 -08:00
GIT-VERSION-FILE.in	…
GIT-VERSION-GEN	Git 2.51	2025-08-17 17:18:23 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'sk/reftable-clarify-tests'	2025-08-01 11:27:14 -07:00
README.md	README: .txt -> .adoc fixes	2025-03-03 13:49:19 -08:00
RelNotes	Start 2.51 cycle, the first batch	2025-06-17 10:44:42 -07:00
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
add-interactive.h	add-interactive: respect color.diff for diff coloring	2025-09-08 14:00:32 -07:00
add-patch.c	add-interactive: respect color.diff for diff coloring	2025-09-08 14:00:32 -07:00
advice.c	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
advice.h	advice: allow disabling default branch name advice	2025-03-25 16:09:28 -07:00
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
apply.h	…
archive-tar.c	config: drop `git_config()` wrapper	2025-07-23 08:15:18 -07:00
archive-zip.c	archive: flush deflate stream until Z_STREAM_END	2025-08-04 13:36:35 -07:00
archive.c	config: drop `git_config_get_bool()` wrapper	2025-07-23 08:15:20 -07:00
archive.h	…
attr.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
attr.h	…
banned.h	…
base85.c	…
base85.h	…
bisect.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
bisect.h	rev-list: make "struct rev_list_info" static to the only user	2025-07-21 15:40:46 -07:00
blame.c	Merge branch 'ly/changed-paths-traversal'	2025-07-23 15:45:15 -07:00
blame.h	…
blob.c	…
blob.h	…
bloom.c	bloom: replace struct bloom_key * with struct bloom_keyvec	2025-07-14 10:03:03 -07:00
bloom.h	bloom: replace struct bloom_key * with struct bloom_keyvec	2025-07-14 10:03:03 -07:00
branch.c	config: drop `git_config_get_multivar_gently()` wrapper	2025-07-23 08:15:21 -07:00
branch.h	…
builtin.h	Merge branch 'jt/diff-pairs'	2025-03-26 16:26:09 +09:00
bulk-checkin.c	object-file: get rid of `the_repository` in `finalize_object_file()`	2025-07-16 22:16:14 -07:00
bulk-checkin.h	object-file: drop `index_blob_stream()`	2025-04-15 08:24:36 -07:00
bundle-uri.c	Merge branch 'ps/object-store'	2025-07-15 15:18:18 -07:00
bundle-uri.h	…
bundle.c	Merge branch 'bc/use-sha256-by-default-in-3.0'	2025-07-21 09:14:25 -07:00
bundle.h	bundle: avoid closing file descriptor twice	2025-01-25 18:38:11 -08:00
cache-tree.c	odb: introduce `odb_write_object()`	2025-07-16 22:16:15 -07:00
cache-tree.h	…
cbtree.c	…
cbtree.h	…
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
checkout.c	config: drop `git_config_get_string()` wrapper	2025-07-23 08:15:19 -07:00
checkout.h	…
chunk-format.c	…
chunk-format.h	…
color.c	color: return enum from git_config_colorbool()	2025-09-16 13:37:04 -07:00
color.h	color: return enum from git_config_colorbool()	2025-09-16 13:37:04 -07:00
column.c	…
column.h	…
combine-diff.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
command-list.txt	builtin: introduce diff-pairs command	2025-03-03 08:17:47 -08:00
commit-graph.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
commit-graph.h	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
commit-reach.c	commit-reach: use `size_t` to track indices when computing merge bases	2024-12-27 08:12:40 -08:00
commit-reach.h	commit-reach: use `size_t` to track indices when computing merge bases	2024-12-27 08:12:40 -08:00
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
commit.h	Merge branch 'lm/add-p-context'	2025-08-04 08:10:33 -07:00
common-exit.c	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
common-init.c	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
common-init.h	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
common-main.c	common-main: split init and exit code into new files	2025-01-28 14:39:16 -08:00
config.c	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
config.h	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
config.mak.dev	Merge branch 'js/comma-semicolon-confusion'	2025-04-15 13:50:17 -07:00
config.mak.in	…
config.mak.uname	Merge branch 'bs/config-mak-freebsd'	2025-07-14 11:19:23 -07:00
configure.ac	Merge branch 'rj/freebsd-sysinfo-build-fix'	2025-07-14 11:19:28 -07:00
connect.c	config: drop `git_config_get_string()` wrapper	2025-07-23 08:15:19 -07:00
connect.h	…
connected.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
connected.h	…
convert.c	config: drop `git_config()` wrapper	2025-07-23 08:15:18 -07:00
convert.h	…
copy.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
copy.h	…
credential.c	Merge branch 'ps/the-repository'	2025-01-21 08:44:54 -08:00
credential.h	Merge branch 'ps/the-repository'	2025-01-21 08:44:54 -08:00
csum-file.c	csum-file: stop depending on `the_repository`	2025-03-10 13:16:18 -07:00
csum-file.h	csum-file: stop depending on `the_repository`	2025-03-10 13:16:18 -07:00
ctype.c	…
daemon.c	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
date.c	date.c: Fix type missmatch warings from msvc	2024-12-26 13:34:28 -08:00
date.h	…
decorate.c	decorate: fix sign comparison warnings	2025-03-10 13:21:13 -07:00
decorate.h	…
delta-islands.c	delta-islands: stop depending on `the_repository`	2025-03-10 13:16:20 -07:00
delta-islands.h	delta-islands: stop depending on `the_repository`	2025-03-10 13:16:20 -07:00
delta.h	…
detect-compiler	detect-compiler: detect clang even if it found CUDA	2025-03-28 17:38:12 -07:00
diagnose.c	odb: get rid of `the_repository` in `for_each()` functions	2025-07-01 14:46:36 -07:00
diagnose.h	…
diff-delta.c	diff-delta: avoid using the comma operator	2025-03-28 17:38:10 -07:00
diff-lib.c	hash: stop depending on `the_repository` in `null_oid()`	2025-03-10 13:16:20 -07:00
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	diff-no-index: do not reference .d_type member of struct dirent	2025-06-18 13:05:29 -07:00
diff.c	diff: don't use diff_options.use_color as a strict bool	2025-09-16 13:37:05 -07:00
diff.h	Merge branch 'ps/object-wo-the-repository'	2025-04-15 13:50:15 -07:00
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	object-store: move function declarations to their respective subsystems	2025-04-29 10:08:12 -07:00
diffcore-rotate.c	…
diffcore.h	diffcore.h: .txt -> .adoc fixes	2025-03-03 13:49:23 -08:00
dir-iterator.c	refs/iterator: separate lifecycle from iteration	2025-03-12 11:31:18 -07:00
dir-iterator.h	refs/iterator: separate lifecycle from iteration	2025-03-12 11:31:18 -07:00
dir.c	config: drop `git_config_set_in_file()` wrapper	2025-07-23 08:15:20 -07:00
dir.h	dir: move starts_with_dot(_dot)_slash to dir.h	2025-06-23 16:38:56 -07:00
editor.c	config: drop `git_config_get_string()` wrapper	2025-07-23 08:15:19 -07:00
editor.h	…
entry.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
entry.h	…
environment.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
environment.h	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
fetch-pack.h	…
fmt-merge-msg.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
fmt-merge-msg.h	…
fsck.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
fsck.h	config: drop `git_config()` wrapper	2025-07-23 08:15:18 -07:00
fsmonitor--daemon.h	…
fsmonitor-ipc.c	…
fsmonitor-ipc.h	…
fsmonitor-ll.h	…
fsmonitor-path-utils.h	…
fsmonitor-settings.c	…
fsmonitor-settings.h	…
fsmonitor.c	config: drop `git_config_get_int()` wrapper	2025-07-23 08:15:20 -07:00
fsmonitor.h	…
generate-cmdlist.sh	doc: use .adoc extension for AsciiDoc files	2025-01-21 12:56:06 -08:00
generate-configlist.sh	Merge branch 'jc/sed-build-fixes'	2025-06-13 13:29:14 -07:00
generate-hooklist.sh	doc: use .adoc extension for AsciiDoc files	2025-01-21 12:56:06 -08:00
generate-perl.sh	…
generate-python.sh	…
generate-script.sh	git-gui: honor TCLTK_PATH in git-gui--askpass	2025-07-31 18:42:54 +02:00
gettext.c	…
gettext.h	…
git-archimport.perl	…
git-compat-util.h	Merge branch 'pw/adopt-c99-bool-officially'	2025-07-24 16:03:55 -07:00
git-curl-compat.h	http.c: allow custom TCP keepalive behavior via config	2025-03-21 01:38:52 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	cvsserver: remove unused escapeRefName function	2025-05-27 08:25:08 -07:00
git-difftool--helper.sh	…
git-filter-branch.sh	filter-branch: stop depending on Perl	2025-04-16 07:30:29 -07:00
git-instaweb.sh	instaweb: fix ip binding for the python http.server	2025-01-10 15:27:52 -08: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-quiltimport.sh	…
git-request-pull.sh	request-pull: stop depending on Perl	2025-04-16 07:30:29 -07:00
git-send-email.perl	Merge branch 'mc/netrc-service-names'	2025-07-14 11:19:25 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git-zlib.c	Merge branch 'jk/zlib-inflate-fixes'	2025-04-15 13:50:14 -07:00
git-zlib.h	git-zlib: use `struct z_stream_s` instead of typedef	2025-04-07 14:53:11 -07:00
git.c	git: show alias info only with lone -h	2025-07-25 16:34:13 -07:00
git.rc.in	…
gpg-interface.c	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
gpg-interface.h	fast-(import\|export): improve on commit signature output format	2025-07-09 16:08:29 -07:00
graph.c	…
graph.h	…
grep.c	grep: don't treat grep_opt.color as a strict bool	2025-09-16 13:37:05 -07:00
grep.h	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
hash-lookup.c	…
hash-lookup.h	…
hash.c	hash: stop depending on `the_repository` in `null_oid()`	2025-03-10 13:16:20 -07:00
hash.h	Merge branch 'bc/use-sha256-by-default-in-3.0'	2025-07-21 09:14:25 -07:00
hashmap.c	Merge branch 'en/hashmap-clear-fix'	2025-05-08 12:36:31 -07:00
hashmap.h	…
help.c	config: drop `git_config_get_string()` wrapper	2025-07-23 08:15:19 -07:00
help.h	…
hex-ll.c	…
hex-ll.h	…
hex.c	…
hex.h	…
hook.c	path: refactor `repo_git_path()` family of functions	2025-02-07 09:59:21 -08:00
hook.h	…
http-backend.c	config: drop `git_config_get_bool()` wrapper	2025-07-23 08:15:20 -07:00
http-fetch.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
http-push.c	Merge branch 'ps/object-store'	2025-07-15 15:18:18 -07:00
http-walker.c	odb: rename `has_object()`	2025-07-01 14:46:38 -07:00
http.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
http.h	hash: stop typedeffing the hash context	2025-01-31 10:06:10 -08:00
ident.c	Merge branch 'sa/multi-mailmap-fix'	2025-06-24 09:48:51 -07:00
ident.h	…
imap-send.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
iterator.h	refs/iterator: separate lifecycle from iteration	2025-03-12 11:31:18 -07:00
json-writer.c	json-writer: add docstrings to jw_* functions	2025-05-16 09:33:06 -07:00
json-writer.h	json-writer: describe the usage of jw_* functions	2025-05-16 09:33:07 -07:00
khash.h	…
kwset.c	kwset: avoid using the comma operator unnecessarily	2025-03-28 17:38:09 -07:00
kwset.h	…
levenshtein.c	…
levenshtein.h	…
line-log.c	bloom: rename function operates on bloom_key	2025-07-14 10:03:02 -07:00
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	config: drop `git_config_set()` wrapper	2025-07-23 08:15:21 -07:00
list-objects-filter-options.h	list-objects-filter-options.h: .txt -> .adoc fixes	2025-03-03 13:49:23 -08:00
list-objects-filter.c	odb: rename `oid_object_info()`	2025-07-01 14:46:37 -07:00
list-objects-filter.h	…
list-objects.c	odb: rename `has_object()`	2025-07-01 14:46:38 -07:00
list-objects.h	…
list.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	odb: rename `oid_object_info()`	2025-07-01 14:46:37 -07:00
log-tree.h	…
loose.c	loose: write loose objects map via their source	2025-07-16 22:16:15 -07:00
loose.h	loose: write loose objects map via their source	2025-07-16 22:16:15 -07:00
ls-refs.c	config: drop `git_config()` wrapper	2025-07-23 08:15:18 -07:00
ls-refs.h	…
mailinfo.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
mailinfo.h	…
mailmap.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
mailmap.h	…
match-trees.c	odb: introduce `odb_write_object()`	2025-07-16 22:16:15 -07:00
match-trees.h	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
merge-blobs.h	…
merge-ll.c	config: drop `git_config()` wrapper	2025-07-23 08:15:18 -07:00
merge-ll.h	…
merge-ort-wrappers.c	merge-ort: support having merge verbosity be set to 0	2025-03-18 09:48:51 -07:00
merge-ort-wrappers.h	merge-recursive.[ch]: thoroughly debug these	2025-04-08 13:59:13 -07:00
merge-ort.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
merge-ort.h	merge-ort: add a new mergeability_only option	2025-05-16 15:09:14 -07:00
merge.c	…
merge.h	…
mergesort.h	…
meson.build	Merge branch 'ms/meson-with-ancient-git-wo-ls-files-dedup'	2025-08-04 08:10:35 -07:00
meson_options.txt	meson: work around broken system PCRE2 dependency in macOS	2025-07-18 10:21:42 -07:00
midx-write.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
midx.c	midx: remove now-unused linked list of multi-pack indices	2025-07-15 12:07:30 -07:00
midx.h	midx: remove now-unused linked list of multi-pack indices	2025-07-15 12:07:30 -07:00
name-hash.c	name-hash: don't add sparse directories in threaded lazy init	2025-05-21 14:51:08 -07:00
name-hash.h	…
notes-cache.c	odb: introduce `odb_write_object()`	2025-07-16 22:16:15 -07:00
notes-cache.h	…
notes-merge.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
notes-merge.h	…
notes-utils.c	config: drop `git_config()` wrapper	2025-07-23 08:15:18 -07:00
notes-utils.h	…
notes.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
notes.h	…
object-file-convert.c	object-file-convert: stop depending on `the_repository`	2025-03-10 13:16:19 -07:00
object-file-convert.h	object-file-convert: stop depending on `the_repository`	2025-03-10 13:16:19 -07:00
object-file.c	object-file: get rid of `the_repository` in index-related functions	2025-07-16 22:16:18 -07:00
object-file.h	object-file: get rid of `the_repository` in `force_object_loose()`	2025-07-16 22:16:17 -07:00
object-name.c	Merge branch 'ps/object-store-midx'	2025-08-03 18:44:27 -07:00
object-name.h	object-name: introduce `repo_get_oid_with_flags()`	2025-03-12 11:31:16 -07:00
object.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
object.h	Merge branch 'kn/bundle-dedup-optim'	2025-04-23 13:58:50 -07:00
odb.c	object-file: get rid of `the_repository` when writing objects	2025-07-16 22:16:16 -07:00
odb.h	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
oid-array.c	…
oid-array.h	…
oidmap.c	oidmap: rename oidmap_free() to oidmap_clear()	2025-05-12 13:06:26 -07:00
oidmap.h	oidmap: add size function	2025-05-12 13:06:26 -07:00
oidset.c	…
oidset.h	…
oidtree.c	…
oidtree.h	…
pack-bitmap-write.c	Merge branch 'ps/object-store'	2025-07-15 15:18:18 -07:00
pack-bitmap.c	Merge branch 'ps/object-store-midx'	2025-08-03 18:44:27 -07:00
pack-bitmap.h	pack-bitmap: add load corrupt bitmap test	2025-07-01 14:41:54 -07:00
pack-check.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
pack-mtimes.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	Merge branch 'ps/object-store'	2025-07-15 15:18:18 -07:00
pack-revindex.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
pack-revindex.h	…
pack-write.c	object-file: get rid of `the_repository` in `finalize_object_file()`	2025-07-16 22:16:14 -07:00
pack.h	object-file: get rid of `the_repository` in `finalize_object_file()`	2025-07-16 22:16:14 -07:00
packfile.c	midx: remove now-unused linked list of multi-pack indices	2025-07-15 12:07:30 -07:00
packfile.h	packfile: refactor `get_multi_pack_index()` to work on sources	2025-07-15 12:07:29 -07:00
pager.c	…
pager.h	…
parallel-checkout.c	config: drop `git_config_get_int()` wrapper	2025-07-23 08:15:20 -07:00
parallel-checkout.h	…
parse-options-cb.c	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
parse-options.c	parse-options: add precision handling for OPTION_COUNTUP	2025-07-09 08:40:32 -07:00
parse-options.h	Merge branch 'lm/add-p-context'	2025-08-04 08:10:33 -07:00
parse.c	parse-options: introduce precision handling for `OPTION_UNSIGNED`	2025-04-17 08:15:16 -07:00
parse.h	parse-options: introduce precision handling for `OPTION_UNSIGNED`	2025-04-17 08:15:16 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path-walk.c	path-walk: add new 'edge_aggressive' option	2025-05-16 12:15:40 -07:00
path-walk.h	path-walk: add new 'edge_aggressive' option	2025-05-16 12:15:40 -07:00
path.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
path.h	object-store: move and rename `odb_pack_keep()`	2025-04-29 10:08:12 -07:00
pathspec.c	pathspec: add flag to indicate operation without repository	2025-05-22 14:20:11 -07:00
pathspec.h	pathspec: add flag to indicate operation without repository	2025-05-22 14:20:11 -07:00
pkt-line.c	Use legacy hash for legacy formats	2025-07-01 14:58:24 -07:00
pkt-line.h	…
preload-index.c	preload-index: stop depending on 'the_repository'	2025-06-10 10:10:40 -07:00
preload-index.h	…
pretty.c	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
pretty.h	…
prio-queue.c	prio-queue: add prio_queue_replace()	2025-07-22 07:28:35 -07:00
prio-queue.h	prio-queue: add prio_queue_replace()	2025-07-22 07:28:35 -07:00
progress.c	…
progress.h	…
promisor-remote.c	config: drop `git_config_get_bool()` wrapper	2025-07-23 08:15:20 -07:00
promisor-remote.h	Add 'promisor-remote' capability to protocol v2	2025-02-18 11:05:37 -08:00
prompt.c	interactive: do strip trailing CRLF from input	2025-07-31 14:17:54 -07:00
prompt.h	…
protocol-caps.c	odb: rename `oid_object_info()`	2025-07-01 14:46:37 -07:00
protocol-caps.h	…
protocol.c	config: drop `git_config_get_string()` wrapper	2025-07-23 08:15:19 -07:00
protocol.h	…
prune-packed.c	object-file: get rid of `the_repository` in loose object iterators	2025-07-16 22:16:17 -07:00
prune-packed.h	…
pseudo-merge.c	…
pseudo-merge.h	Merge branch 'tb/bitamp-typofix'	2025-04-07 14:23:20 -07:00
quote.c	…
quote.h	…
range-diff.c	hash: stop depending on `the_repository` in `null_oid()`	2025-03-10 13:16:20 -07:00
range-diff.h	…
reachable.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
reachable.h	…
read-cache-ll.h	…
read-cache.c	Merge branch 'ps/object-file-wo-the-repository'	2025-08-05 11:53:55 -07:00
read-cache.h	…
rebase-interactive.c	config: drop `git_config_get_value()` wrapper	2025-07-23 08:15:18 -07:00
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'kn/for-each-ref-skip-updates'	2025-08-04 08:10:32 -07:00
ref-filter.h	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
reflog-walk.c	…
reflog-walk.h	…
reflog.c	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
reflog.h	reflog: close leak of reflog expire entry	2025-07-22 16:34:11 -07:00
refs.c	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
refs.h	Merge branch 'kn/for-each-ref-skip'	2025-08-03 18:44:26 -07:00
refspec.c	refspec: replace `refspec_item_init()` with fetch/push variants	2025-03-21 01:45:16 -07:00
refspec.h	refspec: replace `refspec_item_init()` with fetch/push variants	2025-03-21 01:45:16 -07:00
remote-curl.c	Use legacy hash for legacy formats	2025-07-01 14:58:24 -07:00
remote.c	config: drop `git_config_get_string()` wrapper	2025-07-23 08:15:19 -07:00
remote.h	submodule: look up remotes by URL first	2025-06-23 16:38:57 -07:00
replace-object.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
replace-object.h	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
repo-settings.c	Merge branch 'ds/path-walk-2'	2025-06-17 10:44:38 -07:00
repo-settings.h	Merge branch 'ds/path-walk-2'	2025-06-17 10:44:38 -07:00
repository.c	Merge branch 'ps/object-store'	2025-07-15 15:18:18 -07:00
repository.h	Merge branch 'ps/object-store'	2025-07-15 15:18:18 -07:00
rerere.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
rerere.h	rerere: let `rerere_path()` write paths into a caller-provided buffer	2025-02-28 13:54:11 -08:00
reset.c	hash: stop depending on `the_repository` in `null_oid()`	2025-03-10 13:16:20 -07:00
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'ps/config-wo-the-repository'	2025-08-04 08:10:33 -07:00
revision.h	Merge branch 'jk/revision-no-early-output'	2025-08-01 11:27:11 -07:00
run-command.c	config: drop `git_config_get_bool()` wrapper	2025-07-23 08:15:20 -07:00
run-command.h	…
sane-ctype.h	sane-ctype: fix compiler error on Amazon Linux 2	2025-07-10 11:18:37 -07:00
scalar.c	config: drop `git_config_get_multivar_gently()` wrapper	2025-07-23 08:15:21 -07:00
send-pack.c	Merge branch 'ps/object-store'	2025-07-15 15:18:18 -07:00
send-pack.h	send-pack: new return code "ERROR_SEND_PACK_BAD_REF_STATUS"	2025-02-03 15:24:57 -08:00
sequencer.c	config: drop `git_config_set_multivar_in_file_gently()` wrapper	2025-07-23 08:15:21 -07:00
sequencer.h	…
serve.c	Use legacy hash for legacy formats	2025-07-01 14:58:24 -07:00
serve.h	…
server-info.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
server-info.h	…
setup.c	config: drop `git_config_set()` wrapper	2025-07-23 08:15:21 -07:00
setup.h	setup: use the default algorithm to initialize repo format	2025-07-01 14:58:24 -07:00
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	odb: rename `has_object()`	2025-07-01 14:46:38 -07:00
shallow.h	shallow: fix -Wsign-compare warnings	2024-12-27 08:12:40 -08:00
shared.mak	GIT-VERSION-GEN: fix overriding GIT_BUILT_FROM_COMMIT and GIT_DATE	2024-12-20 12:36:45 -08:00
shell.c	…
shortlog.h	…
sideband.c	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	simple-ipc.h: .txt -> .adoc fixes	2025-03-03 13:49:25 -08:00
sparse-index.c	…
sparse-index.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
statinfo.c	…
statinfo.h	…
strbuf.c	strbuf: convert predicates to return bool	2025-07-16 08:18:06 -07:00
strbuf.h	strbuf: convert predicates to return bool	2025-07-16 08:18:06 -07:00
streaming.c	odb: rename `oid_object_info()`	2025-07-01 14:46:37 -07:00
streaming.h	…
string-list.c	string-list: enable sign compare warnings check	2025-07-07 08:07:46 -07:00
string-list.h	…
strmap.c	…
strmap.h	…
strvec.c	Merge branch 'ps/build-sign-compare'	2024-12-23 09:32:11 -08:00
strvec.h	…
sub-process.c	…
sub-process.h	doc: update references to renamed AsciiDoc files	2025-06-06 15:05:47 -07:00
submodule-config.c	config: drop `git_config_set_in_file_gently()` wrapper	2025-07-23 08:15:21 -07:00
submodule-config.h	…
submodule.c	config: drop `git_config_set_in_file_gently()` wrapper	2025-07-23 08:15:21 -07:00
submodule.h	odb: get rid of `the_repository` when handling submodule sources	2025-07-01 14:46:37 -07:00
symlinks.c	…
symlinks.h	…
tag.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
tag.h	…
tar.h	…
tempfile.c	path: adjust last remaining users of `the_repository`	2025-02-28 13:54:11 -08:00
tempfile.h	…
thread-utils.c	thread-utils.c: detect online CPU count on OpenBSD / NetBSD	2025-06-01 17:15:13 -07:00
thread-utils.h	Revert barrier-based LSan threading race workaround	2025-01-01 14:13:01 -08:00
tmp-objdir.c	object-file: get rid of `the_repository` in `finalize_object_file()`	2025-07-16 22:16:14 -07:00
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	Merge branch 'am/trace2-with-valueless-true'	2025-01-29 14:05:10 -08:00
trace2.h	trace2.h: .txt -> .adoc fixes	2025-03-03 13:49:26 -08:00
trailer.c	config: drop `git_config()` wrapper	2025-07-23 08:15:18 -07:00
trailer.h	…
transport-helper.c	Avoid redundant conditions	2025-05-15 13:46:47 -07:00
transport-internal.h	…
transport.c	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
transport.h	transport.h: .txt -> .adoc fixes	2025-03-03 13:49:27 -08:00
tree-diff.c	hash: stop depending on `the_repository` in `null_oid()`	2025-03-10 13:16:20 -07:00
tree-walk.c	odb: rename `read_object_with_reference()`	2025-07-01 14:46:39 -07:00
tree-walk.h	tree-walk.h: fix incorrect API comment	2025-05-02 12:44:04 -07:00
tree.c	odb: rename `repo_read_object_file()`	2025-07-01 14:46:38 -07:00
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	Merge branch 'ps/leakfixes-0129'	2025-02-06 14:56:45 -08:00
unix-socket.h	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	object-store: rename files to "odb.{c,h}"	2025-07-01 14:46:34 -07:00
unpack-trees.h	…
upload-pack.c	odb: rename `has_object()`	2025-07-01 14:46:38 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	Merge branch 'ps/maintenance-ref-lock'	2025-06-25 14:07:36 -07:00
userdiff.c	userdiff: add support for R programming language	2025-05-29 15:29:37 -07:00
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version-def.h.in	…
version.c	Merge branch 'ua/os-version-capability'	2025-02-27 15:23:00 -08:00
version.h	agent: advertise OS name via agent capability	2025-02-19 09:48:37 -08:00
versioncmp.c	config: drop `git_config_get_string_multi()` wrapper	2025-07-23 08:15:19 -07:00
versioncmp.h	…
walker.c	Merge branch 'rs/pop-recent-commit-with-prio-queue'	2025-07-28 12:02:34 -07:00
walker.h	…
wildmatch.c	wildmatch: avoid using of the comma operator	2025-03-28 17:38:11 -07:00
wildmatch.h	…
worktree.c	config: drop `git_config_set_in_file_gently()` wrapper	2025-07-23 08:15:21 -07:00
worktree.h	Merge branch 'sj/ref-consistency-checks-more'	2025-03-26 16:26:10 +09:00
wrapper.c	Merge branch 'cf/wrapper-bsd-eloop'	2025-05-15 17:24:55 -07:00
wrapper.h	wrapper: allow generating insecure random bytes	2025-01-07 09:04:18 -08:00
write-or-die.c	…
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	color: use GIT_COLOR_* instead of numeric constants	2025-09-16 13:37:03 -07:00
wt-status.h	…
xdiff-interface.c	config: move Git config parsing into "environment.c"	2025-07-23 08:15:22 -07:00
xdiff-interface.h	…

README.md

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.adoc to get started, then see Documentation/giteveryday.adoc for a useful minimum set of commands, and Documentation/git-<commandname>.adoc 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.adoc (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