Go to file

Joakim Petersen 9470605a1b git-prompt: make colourization consistent The short upstream state indicator inherits the colour of the last short state indicator before it (if there is one), and the sparsity state indicator inherits this colour as well. This behaviour was introduced by `0ec7c23cdc` (git-prompt: make upstream state indicator location consistent, 2022-02-27), while before this change the aforementioned indicators were white/the default text colour. Some examples to illustrate this behaviour (assuming all indicators are enabled and colourization is on): * If there is something in the stash, both the '$' and the short upstream state indicator following it will be blue. * If the local tree has new, untracked files and there is nothing in the stash, both the '%' and the short upstream state indicator will be red. * If all local changes are added to the index and the stash is empty, both the '+' and the short upstream state indicator following it will be green. * If the local tree is clean and there is nothing in the stash, the short upstream state indicator will be white/${default text colour}. This appears to be an unintended side-effect of the change, and makes little sense semantically (e.g. why is it bad to be in sync with upstream when you have uncommitted local changes?). The cause of the change in colourization is that previously, the short upstream state indicator appeared immediately after the rebase/revert/bisect/merge state indicator (note the position of $p in $gitstring): local f="$h$w$i$s$u" local gitstring="$c$b${f:+$z$f}${sparse}$r$p" Said indicator is prepended with the clear colour code, and the short upstream state indicator is thus also uncoloured. Now, the short upstream state indicator follows the sequence of colourized indicators, without any clearing of colour (again note the position of $p, now in $f): local f="$h$w$i$s$u$p" local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}" If the user is in a sparse checkout, the sparsity state indicator follows a similar pattern to the short upstream state indicator. However, clearing colour of the colourized indicators changes how the sparsity state indicator is colourized, as it currently inherits (and before the change referenced also inherited) the colour of the last short state indicator before it. Reading the commit message of the change that introduced the sparsity state indicator, `afda36dbf3` (git-prompt: include sparsity state as well, 2020-06-21), it appears this colourization also was unintended, so clearing the colour for said indicator further increases consistency. Make the colourization of these state indicators consistent by making all colourized indicators clear their own colour. Make colouring of $c dependent on it not being empty, as it is no longer being used to colour the branch name. Move clearing of $b's prefix to before colourization so it gets cleared properly when colour codes are inserted into it. These changes make changing the layout of the prompt less prone to unintended colour changes in the future. Change coloured Bash prompt tests to reflect the colourization changes: * Move the colour codes to wrap the expected content of the expanded $__git_ps1_branch_name in all tests. * Insert a clear-colour code after the symbol for the first indicator in "prompt - bash color pc mode - dirty status indicator - dirty index and worktree", to reflect that all indicators should clear their own colour. Signed-off-by: Joakim Petersen <joak-pet@online.no> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2022-06-07 09:08:39 -07:00
.github	Merge branch 'ab/ci-updates'	2021-12-15 09:39:49 -08:00
Documentation	Sixth batch	2022-05-31 19:10:35 -07:00
block-sha1	block-sha1: remove use of obsolete x86 assembly	2022-03-10 11:18:05 -08:00
builtin	Merge branch 'js/use-builtin-add-i'	2022-05-30 23:24:03 -07:00
ci	Merge branch 'js/use-builtin-add-i'	2022-05-30 23:24:03 -07:00
compat	Merge branch 'js/ci-gcc-12-fixes'	2022-05-31 19:10:35 -07:00
contrib	git-prompt: make colourization consistent	2022-06-07 09:08:39 -07:00
ewah	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
git-gui	…
gitk-git	Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk	2022-05-11 08:25:02 -07:00
gitweb	gitweb: remove invalid http-equiv="content-type"	2022-03-08 10:10:16 -08:00
mergetools	mergetools: add description to all diff/merge tools	2022-04-03 15:10:04 -07:00
negotiator	…
perl	perl Git.pm: don't ignore signalled failure in _cmd_close()	2022-02-01 15:21:19 -08:00
po	l10n: sv.po: Update Swedish translation (5282t0f0u)	2022-04-17 18:13:34 +01:00
ppc	…
refs	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
reftable	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	git-prompt: make colourization consistent	2022-06-07 09:08:39 -07:00
templates	Makefile: add "$(QUIET)" boilerplate to shared.mak	2022-03-03 14:14:55 -08:00
trace2	trace2: use designated initializers for "struct tr2_dst"	2022-02-24 15:58:55 -08:00
xdiff	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	fsmonitor--daemon: add a built-in fsmonitor daemon	2022-03-25 16:04:15 -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.36.1	2022-05-05 14:36:37 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'ep/coverage-report-wants-test-to-have-run'	2022-05-25 16:42:47 -07:00
README.md	Merge branch 'po/readme-mention-contributor-hints'	2022-02-09 14:20:59 -08:00
RelNotes	Git 2.36.1	2022-05-05 14:36:37 -07:00
SECURITY.md	…
abspath.c	…
aclocal.m4	…
add-interactive.c	Merge branch 'pw/single-key-interactive'	2022-03-21 15:14:24 -07:00
add-interactive.h	…
add-patch.c	Merge branch 'pw/add-p-hunk-split-fix'	2022-02-09 14:20:59 -08:00
advice.c	Merge branch 'tk/ambiguous-fetch-refspec'	2022-04-04 10:56:24 -07:00
advice.h	Merge branch 'tk/ambiguous-fetch-refspec'	2022-04-04 10:56:24 -07:00
alias.c	…
alias.h	…
alloc.c	alloc.[ch]: remove alloc_report() function	2022-04-01 10:16:11 -07:00
alloc.h	alloc.[ch]: remove alloc_report() function	2022-04-01 10:16:11 -07:00
apply.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
apply.h	range-diff: plug memory leak in common invocation	2022-03-04 13:24:19 -08:00
archive-tar.c	archive-*.c: use designated initializers for "struct archiver"	2022-02-24 15:59:20 -08:00
archive-zip.c	Merge branch 'ab/c99-designated-initializers'	2022-03-06 21:25:32 -08:00
archive.c	Merge branch 'jc/archive-add-file-normalize-mode'	2022-05-23 14:39:55 -07:00
archive.h	…
attr.c	Merge branch 'ab/refs-various-fixes'	2022-03-29 12:22:02 -07:00
attr.h	attr.h: remove duplicate struct definition	2022-03-14 05:41:08 +00:00
banned.h	C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code	2022-02-21 19:14:19 -08:00
base85.c	…
bisect.c	bisect--helper: double-check run command on exit code 126 and 127	2022-01-19 09:35:03 -08:00
bisect.h	bisect: output state before we are ready to compute bisection	2022-05-11 12:35:11 -07:00
blame.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	Merge branch 'tk/simple-autosetupmerge'	2022-05-26 14:51:30 -07:00
branch.h	branch: new autosetupmerge option 'simple' for matching branches	2022-04-29 11:20:55 -07:00
builtin.h	fsmonitor--daemon: add a built-in fsmonitor daemon	2022-03-25 16:04:15 -07:00
bulk-checkin.c	Merge branch 'ns/core-fsyncmethod'	2022-03-25 16:38:24 -07:00
bulk-checkin.h	…
bundle.c	bundle: output hash information in 'verify'	2022-03-23 13:14:09 -07:00
bundle.h	bundle: parse filter capability	2022-03-09 10:25:27 -08:00
cache-tree.c	object-file API: have hash_object_file() take "enum object_type"	2022-02-25 17:16:32 -08:00
cache-tree.h	…
cache.h	Merge branch 'ds/midx-normalize-pathname-before-comparison'	2022-05-04 09:51:29 -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	…
checkout.h	…
chunk-format.c	…
chunk-format.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
command-list.txt	hook: add 'run' subcommand	2022-01-07 15:19:34 -08:00
commit-graph.c	Merge branch 'ab/valgrind-fixes'	2022-05-23 14:39:54 -07:00
commit-graph.h	commit-graph: fix memory leak in misused string_list API	2022-03-04 13:24:18 -08:00
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'ab/racy-hooks'	2022-03-30 18:01:10 -07:00
commit.h	shallow: reset commit grafts when shallow is reset	2022-03-17 17:44:38 -07:00
common-main.c	Merge branch 'en/keep-cwd'	2022-01-05 14:01:28 -08:00
config.c	Merge branch 'tk/simple-autosetupmerge'	2022-05-26 14:51:30 -07:00
config.h	fsmonitor: config settings are repository-specific	2022-03-25 16:04:15 -07:00
config.mak.dev	config.mak.dev: alternative workaround to gcc 12 warning in http.c	2022-04-15 16:27:04 -07:00
config.mak.in	…
config.mak.uname	Merge branch 'jh/builtin-fsmonitor-part2'	2022-04-04 10:56:24 -07:00
configure.ac	Merge branch 'ab/misc-cleanup'	2022-05-10 17:41:10 -07:00
connect.c	ls-remote & transport API: release "struct transport_ls_refs_options"	2022-02-06 18:02:34 -08:00
connect.h	…
connected.c	run-command API: remove "env" member, always use "env_array"	2021-11-25 22:15:08 -08:00
connected.h	…
convert.c	convert: clarify line ending conversion warning	2022-04-08 12:53:34 -07:00
convert.h	…
copy.c	…
credential.c	urlmatch.c: add and use a *_release() function	2022-03-04 13:24:18 -08:00
credential.h	…
csum-file.c	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
csum-file.h	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
ctype.c	…
daemon.c	Merge branch 'ep/maint-equals-null-cocci' for maint-2.35	2022-05-02 10:06:04 -07:00
date.c	date API: add and use a date_mode_release()	2022-02-16 09:40:00 -08:00
date.h	date API: add and use a date_mode_release()	2022-02-16 09:40:00 -08:00
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	detect-compiler: make detection independent of locale	2022-05-09 08:52:26 -07:00
diff-delta.c	…
diff-lib.c	…
diff-merges.c	Merge branch 'ja/i18n-common-messages'	2022-02-25 15:47:35 -08:00
diff-merges.h	…
diff-no-index.c	…
diff.c	diff: use mks_tempfile_dt()	2022-04-20 16:17:35 -07:00
diff.h	Merge branch 'js/diff-filter-negation-fix'	2022-02-16 15:14:30 -08:00
diffcore-break.c	…
diffcore-delta.c	diffcore-delta.c: LLP64 compatibility, upcast unity for left shift	2021-12-01 14:48:10 -08:00
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	object-file API: have hash_object_file() take "enum object_type"	2022-02-25 17:16:32 -08:00
diffcore-rotate.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'js/ci-gcc-12-fixes'	2022-05-31 19:10:35 -07:00
dir.h	dir: new flag to remove_dir_recurse() to spare the original_cwd	2021-12-09 13:33:13 -08:00
editor.c	run-command API: remove "env" member, always use "env_array"	2021-11-25 22:15:08 -08:00
entry.c	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
entry.h	Merge branch 'mc/clean-smudge-with-llp64'	2021-11-29 15:41:51 -08:00
environment.c	Merge branch 'ds/midx-normalize-pathname-before-comparison'	2022-05-04 09:51:29 -07:00
environment.h	…
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 'jt/fetch-peek-optional-section'	2022-05-25 16:42:48 -07:00
fetch-pack.h	fetch-pack: add refetch	2022-03-28 10:25:52 -07:00
fmt-merge-msg.c	Merge branch 'fs/ssh-signing-key-lifetime'	2022-01-12 15:11:41 -08: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.h	…
fsmonitor--daemon.h	fsmonitor--daemon: use a cookie file to sync with file system	2022-03-25 16:04:17 -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: config settings are repository-specific	2022-03-25 16:04:15 -07:00
fsmonitor-settings.h	fsmonitor: config settings are repository-specific	2022-03-25 16:04:15 -07:00
fsmonitor.c	fsmonitor: force update index after large responses	2022-03-25 16:04:17 -07:00
fsmonitor.h	fsmonitor: config settings are repository-specific	2022-03-25 16:04:15 -07:00
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
generate-configlist.sh	…
generate-hooklist.sh	…
gettext.c	…
gettext.h	…
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	…
git-compat-util.h	Merge branch 'cb/path-owner-check-with-sudo'	2022-05-26 14:51:32 -07:00
git-curl-compat.h	…
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	vimdiff: add tool documentation	2022-04-03 15:09:52 -07:00
git-mergetool.sh	…
git-p4.py	Merge branch 'tk/p4-metadata-coding-strategies'	2022-05-20 15:27:00 -07:00
git-quiltimport.sh	…
git-request-pull.sh	…
git-send-email.perl	i18n: fix some badly formatted i18n strings	2022-04-11 14:13:46 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	git-sh-setup: remove remnant bits referring to `git-legacy-stash`	2022-01-27 18:00:09 -08:00
git-submodule.sh	submodule: move core cmd_update() logic to C	2022-03-16 15:07:43 -07:00
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'gf/shorthand-version-and-help'	2022-05-20 15:26:53 -07:00
git.rc	…
gpg-interface.c	Merge branch 'fs/gpgsm-update'	2022-03-13 22:56:17 +00:00
gpg-interface.h	ssh signing: make verify-commit consider key lifetime	2021-12-09 13:38:04 -08: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	Merge branch 'rs/pcre-invalid-utf8-fix-fix'	2022-02-25 15:47:38 -08:00
grep.h	grep: simplify config parsing and option parsing	2022-02-15 18:00:50 -08:00
hash-lookup.c	…
hash-lookup.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	Merge branch 'jh/builtin-fsmonitor-part2'	2022-04-04 10:56:24 -07:00
help.h	help: add --no-[external-commands\|aliases] for use with --all	2022-02-23 13:41:37 -08:00
hex.c	…
hook.c	hooks: fix an obscure TOCTOU "did we just run a hook?" race	2022-03-07 13:00:53 -08: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	date API: create a date.h, split from cache.h	2022-02-16 09:40:00 -08: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 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
http-walker.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
http.c	Merge branch 'jc/http-clear-finished-pointer'	2022-05-31 19:10:35 -07:00
http.h	…
ident.c	date API: create a date.h, split from cache.h	2022-02-16 09:40:00 -08:00
imap-send.c	Merge branch 'bc/csprng-mktemps'	2022-04-06 15:21:59 -07:00
iterator.h	…
json-writer.c	…
json-writer.h	…
khash.h	…
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	…
line-log.h	…
line-range.c	…
line-range.h	…
linear-assignment.c	…
linear-assignment.h	…
list-objects-filter-options.c	pack-objects: lazily set up "struct rev_info", don't leak	2022-03-28 09:57:21 -07:00
list-objects-filter-options.h	pack-objects: lazily set up "struct rev_info", don't leak	2022-03-28 09:57:21 -07:00
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	list-objects: handle NULL function pointers	2022-03-09 10:25:27 -08:00
list-objects.h	list-objects: consolidate traverse_commit_list[_filtered]	2022-03-09 10:25:27 -08:00
list.h	…
ll-merge.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
ll-merge.h	ll-merge: make callers responsible for showing warnings	2022-02-02 10:02:27 -08:00
lockfile.c	…
lockfile.h	…
log-tree.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
log-tree.h	…
ls-refs.c	i18n: factorize "invalid value" messages	2022-02-04 13:58:28 -08:00
ls-refs.h	…
mailinfo.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
mailinfo.h	…
mailmap.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
mailmap.h	…
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.h	…
merge-ort.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
merge-ort.h	show, log: include conflict/warning messages in --remerge-diff headers	2022-02-02 10:02:28 -08:00
merge-recursive.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -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	…
mergesort.c	mergesort: avoid left shift overflow	2021-11-18 12:42:06 -08:00
mergesort.h	…
midx.c	Merge branch 'ds/midx-normalize-pathname-before-comparison'	2022-05-04 09:51:29 -07:00
midx.h	midx: read `RIDX` chunk when present	2022-01-27 12:07:53 -08:00
name-hash.c	…
notes-cache.c	object-file API: have write_object_file() take "enum object_type"	2022-02-25 17:16:31 -08:00
notes-cache.h	…
notes-merge.c	misc *.c: use designated initializers for struct assignments	2022-03-17 10:36:42 -07:00
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	object-file API: have write_object_file() take "enum object_type"	2022-02-25 17:16:31 -08:00
notes.h	…
object-file.c	Merge branch 'ab/valgrind-fixes'	2022-05-23 14:39:54 -07:00
object-name.c	object-name: diagnose trees in index properly	2022-04-26 13:56:39 -07:00
object-store.h	object-store.h: remove unused has_sha1_file*()	2022-04-01 10:16:10 -07:00
object.c	object-file API: have hash_object_file() take "enum object_type"	2022-02-25 17:16:32 -08:00
object.h	reflog: libify delete reflog function and helpers	2022-03-02 15:24:47 -08:00
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
oidtree.c	…
oidtree.h	…
pack-bitmap-write.c	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
pack-bitmap.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
pack-bitmap.h	pack-bitmap: drop filter in prepare_bitmap_walk()	2022-03-09 10:25:27 -08:00
pack-check.c	object-file API: have hash_object_file() take "enum object_type"	2022-02-25 17:16:32 -08:00
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	midx: read `RIDX` chunk when present	2022-01-27 12:07:53 -08:00
pack-revindex.h	…
pack-write.c	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
pack.h	…
packfile.c	Merge branch 'ep/maint-equals-null-cocci' for maint-2.35	2022-05-02 10:06:04 -07:00
packfile.h	Merge branch 'tb/pack-revindex-on-disk-cleanup'	2021-12-15 09:39:50 -08:00
pager.c	pager: fix crash when pager program doesn't exist	2021-11-24 16:14:10 -08:00
parallel-checkout.c	i18n: factorize "invalid value" messages	2022-02-04 13:58:28 -08:00
parallel-checkout.h	…
parse-options-cb.c	branch: add flags and config to inherit tracking	2021-12-20 22:40:21 -08:00
parse-options.c	Merge branch 'ja/i18n-common-messages'	2022-02-25 15:47:35 -08:00
parse-options.h	Merge branch 'ja/i18n-common-messages'	2022-02-25 15:47:35 -08:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -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	pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)	2021-12-07 12:31:17 -08:00
pkt-line.c	fetch-pack: redact packfile urls in traces	2021-11-11 10:07:43 -08:00
pkt-line.h	fetch-pack: redact packfile urls in traces	2021-11-11 10:07:43 -08:00
preload-index.c	…
pretty.c	Merge branch 'es/pretty-describe-more'	2021-12-15 09:39:48 -08: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	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
promisor-remote.h	…
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	…
protocol-caps.h	…
protocol.c	…
protocol.h	…
prune-packed.c	…
prune-packed.h	…
quote.c	…
quote.h	…
range-diff.c	range-diff: plug memory leak in read_patches()	2022-03-04 13:24:19 -08:00
range-diff.h	…
reachable.c	pack-bitmap: drop filter in prepare_bitmap_walk()	2022-03-09 10:25:27 -08:00
reachable.h	…
read-cache.c	read-cache: set sparsity when index is new	2022-05-10 16:45:12 -07:00
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	date API: create a date.h, split from cache.h	2022-02-16 09:40:00 -08:00
reflog.c	Merge branch 'ab/reflog-parse-options'	2022-04-04 10:56:21 -07:00
reflog.h	reflog: libify delete reflog function and helpers	2022-03-02 15:24:47 -08:00
refs.c	clone: die() instead of BUG() on bad refs	2022-04-25 11:05:28 -07:00
refs.h	Revert "Merge branch 'ps/avoid-unnecessary-hook-invocation-with-packed-refs'"	2022-04-13 15:51:33 -07:00
refspec.c	refspec.c: use designated initializers for "struct refspec_item"	2022-02-24 15:59:53 -08:00
refspec.h	…
remote-curl.c	Merge branch 'rc/fetch-refetch'	2022-04-04 10:56:23 -07:00
remote.c	push: default to single remote even when not named origin	2022-04-29 11:20:55 -07:00
remote.h	remote: die if branch is not found in repository	2021-11-18 22:31:19 -08:00
replace-object.c	…
replace-object.h	…
repo-settings.c	compat/fsmonitor/fsm-listen-win32: stub in backend for Windows	2022-03-25 16:04:15 -07:00
repository.c	Merge branch 'ab/plug-random-leaks'	2022-03-13 22:56:18 +00:00
repository.h	Merge branch 'jh/builtin-fsmonitor-part2'	2022-04-04 10:56:24 -07:00
rerere.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
rerere.h	…
reset.c	Merge branch 'pw/use-in-process-checkout-in-rebase'	2022-02-18 13:53:27 -08:00
reset.h	rebase --apply: set ORIG_HEAD correctly	2022-01-26 12:08:53 -08:00
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
revision.h	log: "--since-as-filter" option is a non-terminating "--since" variant	2022-04-23 09:36:07 -07:00
run-command.c	Merge branch 'ab/config-based-hooks-2'	2022-02-09 14:21:00 -08:00
run-command.h	run-command.h: remove always unused "clean_on_exit_handler_cbdata"	2022-04-01 10:16:03 -07:00
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'rs/commit-summary-wo-break-rewrite'	2022-05-11 13:56:23 -07:00
sequencer.h	create_autostash(): remove unneeded parameter	2022-01-26 12:08:53 -08:00
serve.c	serve.c: remove unnecessary include	2022-04-06 09:42:12 -07:00
serve.h	…
server-info.c	…
setup.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
sh-i18n--envsubst.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
shallow.h	…
shared.mak	Makefile: use ' ', not non-existing $(wspfx_SQ)	2022-03-21 09:03:45 -07:00
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	…
sparse-index.c	sparse-index: expose 'is_sparse_index_allowed()'	2022-05-10 16:45:12 -07:00
sparse-index.h	sparse-index: expose 'is_sparse_index_allowed()'	2022-05-10 16:45:12 -07:00
split-index.c	split-index: it really is incompatible with the sparse index	2022-01-23 17:06:23 -08:00
split-index.h	…
stable-qsort.c	stable-qsort: avoid using potentially unaligned access	2022-01-07 15:48:40 -08:00
strbuf.c	gettext API users: don't explicitly cast ngettext()'s "n"	2022-03-07 11:57:52 -08:00
strbuf.h	strbuf.h: use BUG(...) not die("BUG: ...")	2021-12-07 12:31:16 -08:00
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	string-list API: change "nr" and "alloc" to "size_t"	2022-03-07 12:02:04 -08:00
strmap.c	…
strmap.h	…
strvec.c	…
strvec.h	…
sub-process.c	run-command API: remove "argv" member, always use "args"	2021-11-25 22:15:07 -08:00
sub-process.h	…
submodule-config.c	Merge branch 'ja/i18n-common-messages'	2022-02-25 15:47:35 -08:00
submodule-config.h	Merge branch 'pb/submodule-recurse-mode-enum'	2022-05-20 15:26:53 -07:00
submodule.c	Merge branch 'jt/reset-grafts-when-resetting-shallow'	2022-03-29 12:22:03 -07:00
submodule.h	Merge branch 'pb/submodule-recurse-mode-enum'	2022-05-20 15:26:53 -07:00
symlinks.c	symlinks: do not include startup_info->original_cwd in dir removal	2021-12-09 13:33:13 -08:00
tag.c	ssh signing: make verify-tag consider key lifetime	2021-12-09 13:38:04 -08:00
tag.h	…
tar.h	…
tempfile.c	tempfile: add mks_tempfile_dt()	2022-04-20 16:17:33 -07:00
tempfile.h	tempfile: add mks_tempfile_dt()	2022-04-20 16:17:33 -07:00
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	log: clean unneeded objects during `log --remerge-diff`	2022-02-02 10:02:27 -08:00
tmp-objdir.h	log: clean unneeded objects during `log --remerge-diff`	2022-02-02 10:02:27 -08:00
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	trace2: add stats for fsync operations	2022-03-30 11:15:55 -07:00
trace2.h	C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code	2022-02-21 19:14:19 -08:00
trailer.c	Merge branch 'ep/maint-equals-null-cocci' for maint-2.35	2022-05-02 10:06:04 -07:00
trailer.h	…
transport-helper.c	fetch: add --refetch option	2022-03-28 10:25:52 -07:00
transport-internal.h	…
transport.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
transport.h	push: new config option "push.autoSetupRemote" supports "simple" push	2022-04-29 11:20:55 -07:00
tree-diff.c	pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)	2021-12-07 12:31:17 -08:00
tree-walk.c	object-file API: pass an enum to read_object_with_reference()	2022-02-25 17:16:32 -08:00
tree-walk.h	…
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unix-stream-server.c	…
unix-stream-server.h	…
unpack-trees.c	unpack-trees: preserve index sparsity	2022-05-10 16:45:13 -07:00
unpack-trees.h	unpack-trees: refuse to remove startup_info->original_cwd	2021-12-09 13:33:12 -08:00
upload-pack.c	upload-pack: look up "want" lines via commit-graph	2022-03-01 10:13:45 -08:00
upload-pack.h	…
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	C99: remove hardcoded-out !HAVE_VARIADIC_MACROS code	2022-02-21 19:14:19 -08:00
userdiff.c	Merge branch 'jd/userdiff-kotlin'	2022-03-23 14:09:29 -07:00
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
walker.c	…
walker.h	…
wildmatch.c	tree-wide: apply equals-null.cocci	2022-05-02 09:50:37 -07:00
wildmatch.h	…
worktree.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
worktree.h	worktree: create init_worktree_config()	2022-02-08 09:49:20 -08:00
wrap-for-bin.sh	…
wrapper.c	Merge branch 'ep/maint-equals-null-cocci'	2022-05-20 15:26:59 -07:00
write-or-die.c	core.fsync: introduce granular fsync control infrastructure	2022-03-10 15:10:22 -08:00
ws.c	…
wt-status.c	Merge branch 'ab/string-list-count-in-size-t'	2022-03-16 17:53:09 -07:00
wt-status.h	…
xdiff-interface.c	Merge branch 'ep/maint-equals-null-cocci' for maint-2.35	2022-05-02 10:06:04 -07:00
xdiff-interface.h	…
zlib.c	…

README.md

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