Go to file
Elijah Newren 554051d691 diffcore-rename: fix BUG when break detection and --follow used together
Prior to commit 9db2ac5616 (diffcore-rename: accelerate rename_dst
setup, 2020-12-11), the function add_rename_dst() resulted in quadratic
runtime since each call inserted the new entry into the array in sorted
order.  The reason for the sorted order requirement was so that
locate_rename_dst(), used when break detection is turned on, could find
the appropriate entry in logarithmic time via bisection on string
comparisons.  (It's better to be quadratic in moving pointers than
quadratic in string comparisons, so this made some sense.)  However,
since break detection always sticks the broken pairs adjacent to each
other, that commit decided to simply append entries to rename_dst, and
record the mapping of (filename) -> (index within rename_dst) via a
strintmap.  Doing this relied on the fact that when adding the source of
a broken pair via register_rename_src(), that the next item we'd process
was the other half of the same broken pair and would be added to
rename_dst via add_rename_dst().  This assumption was fine under break
detection alone, but the combination of break detection and
single_follow violated that assumption because of this code:

		else if (options->single_follow &&
			 strcmp(options->single_follow, p->two->path))
			continue; /* not interested */

which would end up skipping calling add_rename_dst() below that point.
Since I knew I was assuming that the dst pair of a break would always be
added right after the src pair of a break, I added a new BUG() directive
as part of that commit later on at time of use that would check my
assumptions held.  That BUG() didn't trip for nearly 4 years...which
sadly meant I had long since forgotten the related details.  Anyway...

When the dst half of a broken pair is skipped like this, it means that
not only could my recorded index be invalid (just past the end of the
array), it could also point to some unrelated dst that just happened to
be the next one added to the array.  So, to fix this, we need to add a
little more safety around the checks for the recorded break_idx.

It turns out that making a testcase to trigger this is quite the
challenge.  I actually added two testscases:
  * One testcase which uses --follow incorrectly (it uses its single
    pathspec to specifying something other than a single filename), and
    which triggers the same bug reported-by Olaf.  This triggers a
    special case within locate_rename_dst() where idx evaluates to 0
    and rename_dst is NULL, meaning that our return value of
    &rename_dst[idx] happens to evaluate to NULL as well.  This
    addressing of an index into a NULL array hints at deeper problems,
    which are raised in the next testcase...
  * A second testcase which when run under valgrind shows that the code
    actually depends upon unintialized memory, in particular the entry
    just after the end of the rename_dst array.

In short, when the two rare options -B and --follow are used together,
fix the accidental find of the wrong dst entry (which would often be
uninitialized memory just past the end of the array, but also could
have just been a dst for an unrelated path if no dst was recorded for
the expected path).  Do so by adding a little more care around checking
the recorded indices in break_idx.

Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-03-14 18:43:28 -07:00
.github ci: exercise credential helpers 2025-02-20 07:49:52 -08:00
Documentation A bit more updates after -rc2 2025-03-12 12:06:58 -07:00
bin-wrappers
block-sha1
builtin Merge branch 'tb/fetch-follow-tags-fix' 2025-03-10 08:45:58 -07:00
ci ci: exercise credential helpers 2025-02-20 07:49:52 -08:00
compat Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
contrib Merge branch 'js/win-2.49-build-fixes' 2025-03-06 14:06:32 -08:00
ewah
git-gui Merge branch 'ad/set-default-target-in-makefiles' 2025-02-25 14:19:36 -08:00
gitk-git Merge branch 'master' of https://github.com/j6t/gitk 2025-02-20 05:59:56 -08:00
gitweb
mergetools
negotiator
oss-fuzz meson: simplify use of the common-main library 2025-02-26 09:09:35 -08:00
perl meson: fix perl dependencies 2025-01-08 08:05:39 -08:00
po Merge branch 'l10n/zh-TW/2025-03-09' of github.com:l10n-tw/git-po 2025-03-13 21:57:56 +08:00
refs Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
reftable reftable: release name on reftable_reader_new() error 2025-03-04 09:21:39 -08:00
sha1
sha1collisiondetection@855827c583
sha1dc
sha256
subprojects
t diffcore-rename: fix BUG when break detection and --follow used together 2025-03-14 18:43:28 -07:00
templates Makefile: set default goals in makefiles 2025-02-18 09:02:26 -08:00
trace2 trace2/tr2_sysenv.c: *.txt -> *.adoc fixes 2025-03-03 13:49:26 -08:00
xdiff xdiff: *.txt -> *.adoc fixes 2025-03-03 13:49:27 -08:00
.cirrus.yml
.clang-format
.editorconfig editorconfig: add .bash extension 2025-03-03 08:39:47 -08:00
.gitattributes .gitattributes: more *.txt -> *.adoc updates 2025-03-03 13:49:19 -08:00
.gitignore Merge branch 'ds/backfill' 2025-02-18 15:30:31 -08:00
.gitlab-ci.yml Merge branch 'ps/build-meson-fixes' 2025-03-03 08:53:03 -08: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.49-rc2 2025-03-10 08:47:08 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'tz/doc-txt-to-adoc-fixes' 2025-03-06 14:06:31 -08:00
README.md README: *.txt -> *.adoc fixes 2025-03-03 13:49:19 -08:00
RelNotes doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
SECURITY.md
abspath.c
abspath.h
aclocal.m4
add-interactive.c
add-interactive.h
add-patch.c
advice.c
advice.h advice.h: *.txt -> *.adoc fixes 2025-03-03 13:49:21 -08:00
alias.c
alias.h
alloc.c
alloc.h
apply.c apply.c: *.txt -> *.adoc fixes 2025-03-03 13:49:22 -08:00
apply.h
archive-tar.c compat/zlib: provide stubs for `deflateSetHeader()` 2025-01-28 13:03:23 -08:00
archive-zip.c
archive.c git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" 2025-01-28 13:03:22 -08:00
archive.h
attr.c
attr.h
banned.h
base85.c
base85.h
bisect.c path: drop `git_pathdup()` in favor of `repo_git_path()` 2025-02-07 09:59:22 -08:00
bisect.h
blame.c
blame.h
blob.c
blob.h
bloom.c
bloom.h
branch.c worktree: return allocated string from `get_worktree_git_dir()` 2025-02-07 09:59:23 -08:00
branch.h
builtin.h builtin.h: *.txt -> *.adoc fixes 2025-03-03 13:49:22 -08:00
bulk-checkin.c Merge branch 'ps/hash-cleanup' 2025-02-10 10:18:31 -08:00
bulk-checkin.h
bundle-uri.c
bundle-uri.h
bundle.c bundle: avoid closing file descriptor twice 2025-01-25 18:38:11 -08:00
bundle.h bundle: avoid closing file descriptor twice 2025-01-25 18:38:11 -08:00
cache-tree.c
cache-tree.h
cbtree.c
cbtree.h
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-diff: drop list-tail argument to diff_tree_paths() 2025-01-09 12:24:26 -08:00
command-list.txt backfill: add builtin boilerplate 2025-02-03 16:12:41 -08:00
commit-graph.c path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c commit: avoid parent list buildup in clear_commit_marks_many() 2025-02-24 08:51:18 -08:00
commit.h
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 'tz/doc-txt-to-adoc-fixes' 2025-03-06 14:06:31 -08:00
config.h
config.mak.dev
config.mak.in
config.mak.uname
configure.ac
connect.c Merge branch 'cc/lop-remote' 2025-03-05 10:37:44 -08:00
connect.h
connected.c
connected.h
convert.c
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 Merge branch 'ps/hash-cleanup' 2025-02-10 10:18:31 -08:00
csum-file.h hash: stop typedeffing the hash context 2025-01-31 10:06:10 -08:00
ctype.c
daemon.c
date.c
date.h
decorate.c
decorate.h
delta-islands.c
delta-islands.h
delta.h
detect-compiler
diagnose.c
diagnose.h
diff-delta.c
diff-lib.c run_diff_files(): de-mystify the size of combine_diff_path struct 2025-01-09 12:24:24 -08:00
diff-merges.c
diff-merges.h
diff-no-index.c
diff.c Merge branch 'bc/diff-reject-empty-arg-to-pickaxe' 2025-02-25 14:19:35 -08:00
diff.h diff.h: *.txt -> *.adoc fixes 2025-03-03 13:49:23 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c diffcore-rename: fix BUG when break detection and --follow used together 2025-03-14 18:43:28 -07:00
diffcore-rotate.c
diffcore.h diffcore.h: *.txt -> *.adoc fixes 2025-03-03 13:49:23 -08:00
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
dir.h backfill: add --sparse option 2025-02-03 16:12:42 -08:00
editor.c path: refactor `repo_git_path()` family of functions 2025-02-07 09:59:21 -08:00
editor.h
entry.c
entry.h
environment.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
environment.h environment: move access to "core.sharedRepository" into repo settings 2025-02-28 13:54:11 -08:00
exec-cmd.c
exec-cmd.h
fetch-negotiator.c
fetch-negotiator.h
fetch-pack.c Merge branch 'kn/pack-write-with-reduced-globals' 2025-02-03 10:23:34 -08:00
fetch-pack.h
fmt-merge-msg.c
fmt-merge-msg.h
fsck.c fsck: reject misconfigured fsck.skipList 2025-01-07 09:22:25 -08:00
fsck.h fsck.h: *.txt -> *.adoc fixes 2025-03-03 13:49:23 -08: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
fsmonitor.h
generate-cmdlist.sh doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08:00
generate-configlist.sh doc: use .adoc extension for AsciiDoc files 2025-01-21 12:56:06 -08: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
gettext.c
gettext.h
git-archimport.perl
git-compat-util.h Merge branch 'ps/zlib-ng' 2025-02-06 14:56:45 -08: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 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
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git-zlib.c git-zlib: cast away potential constness of `next_in` pointer 2025-01-28 13:03:23 -08:00
git-zlib.h git-compat-util: move include of "compat/zlib.h" into "git-zlib.h" 2025-01-28 13:03:22 -08:00
git.c backfill: add builtin boilerplate 2025-02-03 16:12:41 -08:00
git.rc.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash-lookup.c
hash-lookup.h
hash.h hash: provide generic wrappers to update hash contexts 2025-01-31 10:06:11 -08:00
hashmap.c
hashmap.h
help.c Merge branch 'tc/zlib-ng-fix' 2025-03-12 12:06:58 -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 path: drop `git_pathdup()` in favor of `repo_git_path()` 2025-02-07 09:59:22 -08:00
http-fetch.c
http-push.c global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
http-walker.c
http.c http: allow using netrc for WebDAV-based HTTP protocol 2025-02-24 08:49:10 -08:00
http.h hash: stop typedeffing the hash context 2025-01-31 10:06:10 -08:00
ident.c ident: stop assuming that `gw_gecos` is writable 2025-03-06 08:35:07 -08:00
ident.h
imap-send.c
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
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
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
list-objects-filter.h
list-objects.c
list-objects.h
list.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
loose.c path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08:00
loose.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
match-trees.h
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-ll.c
merge-ll.h
merge-ort-wrappers.c
merge-ort-wrappers.h
merge-ort.c
merge-ort.h
merge-recursive.c merge-recursive: optimize time complexity for process_renames 2025-02-13 21:33:00 -08:00
merge-recursive.h
merge.c
merge.h
mergesort.h
meson.build meson: fix sorting 2025-03-06 08:35:07 -08:00
meson_options.txt Merge branch 'ps/meson-contrib-bits' 2025-03-03 08:53:03 -08:00
midx-write.c path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08:00
midx.c
midx.h
name-hash.c
name-hash.h
notes-cache.c
notes-cache.h
notes-merge.c path: drop `git_path()` in favor of `repo_git_path()` 2025-02-28 13:54:11 -08:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-file-convert.c
object-file-convert.h
object-file.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
object-file.h
object-name.c object-name.c: *.txt -> *.adoc fixes 2025-03-03 13:49:24 -08:00
object-name.h
object-store-ll.h
object-store.h
object.c
object.h
oid-array.c
oid-array.h
oidmap.c
oidmap.h
oidset.c
oidset.h
oidtree.c
oidtree.h
pack-bitmap-write.c path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08:00
pack-bitmap.c Merge branch 'ps/the-repository' 2025-01-21 08:44:54 -08:00
pack-bitmap.h
pack-check.c global: adapt callers to use generic hash context helpers 2025-01-31 10:06:11 -08:00
pack-mtimes.c
pack-mtimes.h
pack-objects.c
pack-objects.h Merge branch 'ds/name-hash-tweaks' 2025-02-12 10:08:51 -08:00
pack-revindex.c
pack-revindex.h
pack-write.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
pack.h Merge branch 'kn/pack-write-with-reduced-globals' 2025-02-03 10:23:34 -08:00
packfile.c Merge branch 'jk/pack-header-parse-alignment-fix' 2025-01-28 13:02:23 -08:00
packfile.h Merge branch 'jk/pack-header-parse-alignment-fix' 2025-01-28 13:02:23 -08:00
pager.c
pager.h
parallel-checkout.c
parallel-checkout.h
parse-options-cb.c
parse-options.c Merge branch 'jc/show-usage-help' 2025-01-28 13:02:22 -08:00
parse-options.h parse-options.h: *.txt -> *.adoc fixes 2025-03-03 13:49:24 -08:00
parse.c
parse.h
patch-delta.c
patch-ids.c
patch-ids.h
path-walk.c backfill: add --sparse option 2025-02-03 16:12:42 -08:00
path-walk.h backfill: add --sparse option 2025-02-03 16:12:42 -08:00
path.c path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08:00
path.h path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
preload-index.h
pretty.c
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
promisor-remote.c promisor-remote: check advertised name or URL 2025-02-18 11:05:37 -08:00
promisor-remote.h Add 'promisor-remote' capability to protocol v2 2025-02-18 11:05:37 -08:00
prompt.c
prompt.h
protocol-caps.c
protocol-caps.h
protocol.c
protocol.h
prune-packed.c
prune-packed.h
pseudo-merge.c
pseudo-merge.h pseudo-merge.h: *.txt -> *.adoc fixes 2025-03-03 13:49:24 -08:00
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c worktree: return allocated string from `get_worktree_git_dir()` 2025-02-07 09:59:23 -08:00
reachable.h
read-cache-ll.h
read-cache.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
read-cache.h
rebase-interactive.c
rebase-interactive.h
rebase.c
rebase.h
ref-filter.c Merge branch 'rs/ref-fitler-used-atoms-value-fix' 2025-01-29 14:05:09 -08:00
ref-filter.h ref-filter: remove ref_format_clear() 2025-01-21 09:06:24 -08:00
reflog-walk.c
reflog-walk.h
reflog.c
reflog.h
refs.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
refs.h Merge branch 'tz/doc-txt-to-adoc-fixes' 2025-03-06 14:06:31 -08:00
refspec.c refspec: clarify function naming and documentation 2025-02-18 09:44:27 -08:00
refspec.h refspec: clarify function naming and documentation 2025-02-18 09:44:27 -08:00
remote-curl.c
remote.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
remote.h Merge branch 'tc/clone-single-revision' 2025-02-14 17:53:48 -08:00
replace-object.c
replace-object.h
repo-settings.c environment: move access to "core.sharedRepository" into repo settings 2025-02-28 13:54:11 -08:00
repo-settings.h environment: move access to "core.sharedRepository" into repo settings 2025-02-28 13:54:11 -08:00
repository.c repo-settings: introduce function to clear struct 2025-02-28 13:54:11 -08:00
repository.h
rerere.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
rerere.h rerere: let `rerere_path()` write paths into a caller-provided buffer 2025-02-28 13:54:11 -08:00
reset.c
reset.h
resolve-undo.c
resolve-undo.h
revision.c worktree: return allocated string from `get_worktree_git_dir()` 2025-02-07 09:59:23 -08:00
revision.h
run-command.c
run-command.h
sane-ctype.h
scalar.c Merge branch 'ps/leakfixes-0129' 2025-02-06 14:56:45 -08:00
send-pack.c send-pack: gracefully close the connection for atomic push 2025-02-03 15:24:58 -08: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 rebase -i: reword empty commit after fast-forward 2025-02-11 09:50:53 -08:00
sequencer.h
serve.c Add 'promisor-remote' capability to protocol v2 2025-02-18 11:05:37 -08:00
serve.h
server-info.c path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08:00
server-info.h
setup.c Merge branch 'tz/doc-txt-to-adoc-fixes' 2025-03-06 14:06:31 -08:00
setup.h
sh-i18n--envsubst.c
sha1dc_git.c
sha1dc_git.h
shallow.c path: drop `git_path()` in favor of `repo_git_path()` 2025-02-28 13:54:11 -08:00
shallow.h
shared.mak
shell.c
shortlog.h
sideband.c
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 Git 2.47.2 2025-01-13 12:55:26 -08:00
strbuf.h Git 2.47.2 2025-01-13 12:55:26 -08:00
streaming.c
streaming.h
string-list.c
string-list.h
strmap.c
strmap.h
strvec.c
strvec.h
sub-process.c
sub-process.h
submodule-config.c
submodule-config.h
submodule.c submodule: refactor `submodule_to_gitdir()` to accept a repo 2025-02-07 09:59:21 -08:00
submodule.h submodule: refactor `submodule_to_gitdir()` to accept a repo 2025-02-07 09:59:21 -08:00
symlinks.c
symlinks.h
tag.c
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.h Revert barrier-based LSan threading race workaround 2025-01-01 14:13:01 -08:00
tmp-objdir.c path: adjust last remaining users of `the_repository` 2025-02-28 13:54:11 -08: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
trailer.h
transport-helper.c
transport-internal.h
transport.c Merge branch 'ps/send-pack-unhide-error-in-atomic-push' 2025-02-18 15:30:32 -08:00
transport.h transport.h: *.txt -> *.adoc fixes 2025-03-03 13:49:27 -08:00
tree-diff.c tree-diff: make list tail-passing more explicit 2025-01-09 12:24:27 -08:00
tree-walk.c
tree-walk.h
tree.c
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 unpack-trees.c: *.txt -> *.adoc fixes 2025-03-03 13:49:27 -08:00
unpack-trees.h
upload-pack.c Add 'promisor-remote' capability to protocol v2 2025-02-18 11:05:37 -08:00
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c usage: add show_usage_if_asked() 2025-01-17 13:30:02 -08:00
userdiff.c
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
versioncmp.h
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'ps/path-sans-the-repository' 2025-03-05 10:37:43 -08:00
worktree.h worktree: return allocated string from `get_worktree_git_dir()` 2025-02-07 09:59:23 -08:00
wrapper.c wrapper: allow generating insecure random bytes 2025-01-07 09:04:18 -08: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 path: drop `git_path()` in favor of `repo_git_path()` 2025-02-28 13:54:11 -08:00
wt-status.h
xdiff-interface.c
xdiff-interface.h

README.md

Build status

Git - fast, scalable, distributed revision control system

Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals.

Git is an Open Source project covered by the GNU General Public License version 2 (some parts of it are under different licenses, compatible with the GPLv2). It was originally written by Linus Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

Many Git online resources are accessible from https://git-scm.com/ including full documentation and Git related tools.

See Documentation/gittutorial.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