Go to file

Victoria Dye 5305474ec4 ref-cache.c: fix prefix matching in ref iteration Update 'cache_ref_iterator_advance' to skip over refs that are not matched by the given prefix. Currently, a ref entry is considered "matched" if the entry name is fully contained within the prefix: * prefix: "refs/heads/v1" * entry: "refs/heads/v1.0" OR if the prefix is fully contained in the entry name: * prefix: "refs/heads/v1.0" * entry: "refs/heads/v1" The first case is always correct, but the second is only correct if the ref cache entry is a directory, for example: * prefix: "refs/heads/example" * entry: "refs/heads/" Modify the logic in 'cache_ref_iterator_advance' to reflect these expectations: 1. If 'overlaps_prefix' returns 'PREFIX_EXCLUDES_DIR', then the prefix and ref cache entry do not overlap at all. Skip this entry. 2. If 'overlaps_prefix' returns 'PREFIX_WITHIN_DIR', then the prefix matches inside this entry if it is a directory. Skip if the entry is not a directory, otherwise iterate over it. 3. Otherwise, 'overlaps_prefix' returned 'PREFIX_CONTAINS_DIR', indicating that the cache entry (directory or not) is fully contained by or equal to the prefix. Iterate over this entry. Note that condition 2 relies on the names of directory entries having the appropriate trailing slash. The existing function documentation of 'create_dir_entry' explicitly calls out the trailing slash requirement, so this is a safe assumption to make. This bug generally doesn't have any user-facing impact, since it requires: 1. using a non-empty prefix without a trailing slash in an iteration like 'for_each_fullref_in', 2. the callback to said iteration not reapplying the original filter (as for-each-ref does) to ensure unmatched refs are skipped, and 3. the repository having one or more refs that match part of, but not all of, the prefix. However, there are some niche scenarios that meet those criteria (specifically, 'rev-parse --bisect' and '(log\|show\|shortlog) --bisect'). Add tests covering those cases to demonstrate the fix in this patch. Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2023-10-09 15:53:13 -07:00
.github	…
Documentation	Git 2.42	2023-08-21 09:34:58 -07:00
block-sha1	…
builtin	fsck: use enum object_type for fsck_walk callback	2023-08-19 21:17:32 -07:00
ci	…
compat	Merge branch 'ds/maintenance-on-windows-fix'	2023-08-15 10:19:47 -07:00
contrib	Merge branch 'ds/maintenance-on-windows-fix'	2023-08-15 10:19:47 -07:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
oss-fuzz	…
perl	…
po	Merge branch 'po-id' of github.com:bagasme/git-po	2023-08-21 07:05:38 +08:00
refs	ref-cache.c: fix prefix matching in ref iteration	2023-10-09 15:53:13 -07:00
reftable	…
sha1	avoid SHA-1 functions deprecated in OpenSSL 3+	2023-08-01 08:34:56 -07:00
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	Merge branch 'ew/hash-with-openssl-evp'	2023-08-09 16:18:15 -07:00
t	ref-cache.c: fix prefix matching in ref iteration	2023-10-09 15:53:13 -07:00
templates	…
trace2	Merge branch 'bb/use-trace2-counters-for-fsync-stats'	2023-08-02 09:37:23 -07:00
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	gitignore: ignore clangd .cache directory	2023-08-04 10:56:51 -07:00
.gitmodules	…
.mailmap	mailmap: change primary address for Glen Choo	2023-08-07 11:58:17 -07:00
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	Git 2.42	2023-08-21 09:34:58 -07:00
INSTALL	…
LGPL-2.1	…
Makefile	Merge branch 'ds/maintenance-on-windows-fix'	2023-08-15 10:19:47 -07:00
README.md	…
RelNotes	…
SECURITY.md	…
abspath.c	…
abspath.h	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	…
advice.c	advice: handle "rebase" in error_resolve_conflict()	2023-08-07 13:21:00 -07:00
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	…
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	…
attr.h	…
banned.h	…
base85.c	…
base85.h	…
bisect.c	…
bisect.h	…
blame.c	blame: allow --contents to work with bare repo	2023-07-21 07:32:58 -07:00
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	branch: update the message to refuse touching a branch in-use	2023-07-21 15:30:57 -07:00
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle-uri.c	…
bundle-uri.h	…
bundle.c	Merge branch 'dk/bundle-i18n-more'	2023-07-25 12:05:24 -07:00
bundle.h	…
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	…
command-list.txt	…
commit-graph.c	Merge branch 'tb/object-access-overflow-protection'	2023-07-25 12:05:23 -07:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	Merge branch 'rs/pack-objects-parseopt-fix'	2023-07-28 09:45:22 -07:00
commit.h	…
common-main.c	…
config.c	…
config.h	…
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	…
connect.h	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
copy.h	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
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	…
diff-merges.c	…
diff-merges.h	…
diff-no-index.c	…
diff.c	…
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore-rotate.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	…
dir.h	…
editor.c	…
editor.h	…
entry.c	…
entry.h	…
environment.c	Merge branch 'rs/pack-objects-parseopt-fix'	2023-07-28 09:45:22 -07:00
environment.h	Merge branch 'rs/pack-objects-parseopt-fix'	2023-07-28 09:45:22 -07:00
exec-cmd.c	…
exec-cmd.h	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
fsck.c	Merge branch 'jk/unused-parameter'	2023-07-25 12:05:24 -07:00
fsck.h	…
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	…
generate-configlist.sh	…
generate-hooklist.sh	…
gettext.c	…
gettext.h	…
git-archimport.perl	…
git-compat-util.h	…
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	…
git-mergetool.sh	…
git-p4.py	…
git-quiltimport.sh	…
git-request-pull.sh	…
git-send-email.perl	send-email: avoid creating more than one Term::ReadLine object	2023-08-08 16:48:17 -07:00
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git-zlib.c	…
git-zlib.h	…
git.c	…
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash-ll.h	Merge branch 'ew/hash-with-openssl-evp'	2023-08-09 16:18:15 -07:00
hash-lookup.c	…
hash-lookup.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	…
help.h	…
hex.c	hex: retire get_sha1_hex()	2023-07-24 16:11:23 -07:00
hex.h	hex: retire get_sha1_hex()	2023-07-24 16:11:23 -07:00
hook.c	…
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-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	Merge branch 'bc/ident-dot-is-no-longer-crud-letter'	2023-08-09 16:18:15 -07: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.c	…
list-objects-filter.h	…
list-objects.c	Merge branch 'jc/tree-walk-drop-base-offset'	2023-08-02 09:37:23 -07:00
list-objects.h	…
list.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
ls-refs.c	Merge branch 'tb/refs-exclusion-and-packed-refs'	2023-07-21 13:47:26 -07:00
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.h	…
merge.c	…
merge.h	…
mergesort.h	…
midx.c	Merge branch 'tb/object-access-overflow-protection'	2023-07-25 12:05:23 -07:00
midx.h	…
name-hash.c	…
name-hash.h	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-file.c	Merge branch 'jk/unused-parameter'	2023-07-25 12:05:24 -07:00
object-file.h	…
object-name.c	…
object-name.h	…
object-store-ll.h	Merge branch 'tb/object-access-overflow-protection'	2023-07-25 12:05:23 -07:00
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	…
pack-bitmap.c	Merge branch 'tb/object-access-overflow-protection'	2023-07-25 12:05:23 -07:00
pack-bitmap.h	…
pack-check.c	…
pack-mtimes.c	…
pack-mtimes.h	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	Merge branch 'jc/retire-get-sha1-hex'	2023-08-04 10:52:30 -07:00
packfile.h	…
pager.c	…
pager.h	…
parallel-checkout.c	…
parallel-checkout.h	…
parse-options-cb.c	…
parse-options.c	parse-options: disallow negating OPTION_SET_INT 0	2023-08-08 16:55:07 -07:00
parse-options.h	fetch: reject --no-ipv[46]	2023-07-18 14:47:30 -07:00
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
path.h	…
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.h	…
prompt.c	…
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.h	…
reachable.c	…
reachable.h	…
read-cache-ll.h	…
read-cache.c	…
read-cache.h	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'ks/ref-filter-describe'	2023-08-02 09:37:24 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
reflog.c	…
reflog.h	…
refs.c	Merge branch 'jk/unused-parameter'	2023-07-25 12:05:24 -07:00
refs.h	Merge branch 'tb/refs-exclusion-and-packed-refs'	2023-07-21 13:47:26 -07:00
refspec.c	…
refspec.h	…
remote-curl.c	…
remote.c	Merge branch 'ah/advise-force-pushing'	2023-07-25 12:05:23 -07:00
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	Merge branch 'jc/retire-get-sha1-hex'	2023-08-04 10:52:30 -07:00
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'jk/unused-parameter'	2023-07-25 12:05:24 -07:00
revision.h	Merge branch 'jk/unused-parameter'	2023-07-25 12:05:24 -07:00
run-command.c	Merge branch 'ma/locate-in-path-for-windows'	2023-08-09 16:18:16 -07:00
run-command.h	…
sane-ctype.h	…
scalar.c	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'pw/rebase-skip-commit-message-fix'	2023-08-09 16:18:16 -07:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
server-info.h	…
setup.c	…
setup.h	…
sh-i18n--envsubst.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shared.mak	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
simple-ipc.h	…
sparse-index.c	…
sparse-index.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
statinfo.c	…
statinfo.h	…
strbuf.c	Merge branch 'rs/strbuf-addftime-simplify'	2023-07-25 12:05:24 -07:00
strbuf.h	…
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.h	…
symlinks.c	…
symlinks.h	…
tag.c	…
tag.h	…
tar.h	…
tempfile.c	…
tempfile.h	…
thread-utils.c	…
thread-utils.h	…
tmp-objdir.c	…
tmp-objdir.h	…
trace.c	…
trace.h	…
trace2.c	wrapper: use trace2 counters to collect fsync stats	2023-07-20 11:52:53 -07:00
trace2.h	Merge branch 'bb/use-trace2-counters-for-fsync-stats'	2023-08-02 09:37:23 -07:00
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	…
transport.h	…
tree-diff.c	Merge branch 'jc/tree-walk-drop-base-offset'	2023-08-02 09:37:23 -07:00
tree-walk.c	Merge branch 'jc/tree-walk-drop-base-offset'	2023-08-02 09:37:23 -07:00
tree-walk.h	…
tree.c	Merge branch 'jc/tree-walk-drop-base-offset'	2023-08-02 09:37:23 -07:00
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.h	…
upload-pack.c	Merge branch 'tb/refs-exclusion-and-packed-refs'	2023-07-21 13:47:26 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	…
utf8.h	…
varint.c	…
varint.h	…
version.c	…
version.h	…
versioncmp.c	…
versioncmp.h	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
worktree.c	…
worktree.h	…
wrap-for-bin.sh	…
wrapper.c	Merge branch 'bb/use-trace2-counters-for-fsync-stats'	2023-08-02 09:37:23 -07:00
wrapper.h	wrapper: use trace2 counters to collect fsync stats	2023-07-20 11:52:53 -07:00
write-or-die.c	…
write-or-die.h	…
ws.c	…
ws.h	…
wt-status.c	Merge branch 'ah/advise-force-pushing'	2023-07-25 12:05:23 -07:00
wt-status.h	…
xdiff-interface.c	…
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.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