1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-04 16:27:54 +01:00
Find a file
Jeff King 087b6d5840 sha1_file: always allow relative paths to alternates
We recursively expand alternates repositories, so that if A
borrows from B which borrows from C, A can see all objects.

For the root object database, we allow relative paths, so A
can point to B as "../B/objects". However, we currently do
not allow relative paths when recursing, so B must use an
absolute path to reach C.

That is an ancient protection from c2f493a (Transitively
read alternatives, 2006-05-07) that tries to avoid adding
the same alternate through two different paths. Since
5bdf0a8 (sha1_file: normalize alt_odb path before comparing
and storing, 2011-09-07), we use a normalized absolute path
for each alt_odb entry.

This means that in most cases the protection is no longer
necessary; we will detect the duplicate no matter how we got
there (but see below).  And it's a good idea to get rid of
it, as it creates an unnecessary complication when setting
up recursive alternates (B has to know that A is going to
borrow from it and make sure to use an absolute path).

Note that our normalization doesn't actually look at the
filesystem, so it can still be fooled by crossing symbolic
links. But that's also true of absolute paths, so it's not a
good reason to disallow only relative paths (it's
potentially a reason to switch to real_path(), but that's a
separate and non-trivial change).

We adjust the test script here to demonstrate that this now
works, and add new tests to show that the normalization does
indeed suppress duplicates.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-10-10 13:52:37 -07:00
block-sha1
builtin count-objects: report alternates via verbose mode 2016-10-10 13:52:37 -07:00
ci
compat Merge branch 'rs/compat-strdup' into maint 2016-09-19 13:51:42 -07:00
contrib Merge branch 'rs/copy-array' 2016-10-03 13:30:33 -07:00
Documentation count-objects: report alternates via verbose mode 2016-10-10 13:52:37 -07:00
ewah
git-gui Merge branch 'va/git-gui-i18n' 2016-10-03 13:30:37 -07:00
gitk-git
gitweb gitweb: use highlight's shebang detection 2016-09-25 16:39:11 -07:00
mergetools
perl
po git-gui: l10n: add Portuguese translation 2016-09-26 07:18:33 -07:00
ppc
refs Merge branch 'mh/ref-store' 2016-09-19 13:47:19 -07:00
t sha1_file: always allow relative paths to alternates 2016-10-10 13:52:37 -07:00
templates
vcs-svn Merge branch 'mr/vcs-svn-printf-ulong' into maint 2016-09-29 16:49:37 -07:00
xdiff Merge branch 'mh/diff-indent-heuristic' 2016-10-03 13:30:38 -07:00
.gitattributes
.gitignore
.mailmap add David Turner's Two Sigma address 2016-09-26 17:46:44 -07:00
.travis.yml Merge branch 'ls/travis-homebrew-path-fix' into maint 2016-09-29 16:49:45 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c introduce CHECKOUT_INIT 2016-09-22 13:42:18 -07:00
apply.h apply: learn to use a different index file 2016-09-07 12:29:54 -07:00
archive-tar.c Merge branch 'jk/big-and-future-archive-tar' 2016-08-12 09:47:37 -07:00
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h builtin: convert textconv_object to use struct object_id 2016-09-07 12:59:42 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
cache-tree.h
cache.h alternates: store scratch buffer as strbuf 2016-10-10 13:52:36 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maint 2016-09-19 13:51:41 -07:00
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h Merge branch 'vs/typofix' 2016-08-12 09:47:37 -07:00
commit.c Merge branch 'rs/copy-array' 2016-10-03 13:30:33 -07:00
commit.h Merge branch 'rs/pull-signed-tag' 2016-08-19 15:34:14 -07:00
common-main.c
config.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
config.mak.in
config.mak.uname
configure.ac
connect.c Merge branch 'va/i18n-more' 2016-09-26 16:09:18 -07:00
connect.h
connected.c
connected.h
convert.c convert: Correct NNO tests and missing LF will be replaced by CRLF 2016-08-14 13:45:52 -07:00
convert.h
copy.c
COPYING
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c Merge branch 'jk/common-main' into maint 2016-09-08 21:35:51 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
diff-no-index.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
diff.c Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
diff.h Merge branch 'mh/diff-indent-heuristic' 2016-09-26 16:09:16 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
dir.h
editor.c
entry.c streaming: make stream_blob_to_fd take struct object_id 2016-09-07 12:59:42 -07:00
environment.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c fetch-pack: do not reset in_vain on non-novel acks 2016-09-23 12:37:45 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl diff: improve positioning of add/delete blocks in diffs 2016-09-19 10:25:11 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'rs/copy-array' 2016-10-03 13:30:33 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh difftool: always honor fatal error exit codes 2016-08-15 15:24:05 -07:00
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh git-merge-octopus: do not capitalize "octopus" 2016-09-08 12:17:10 -07:00
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py Spelling fixes 2016-08-11 14:35:42 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'rt/rebase-i-broken-insn-advise' into maint 2016-09-29 16:49:46 -07:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh i18n: stash: mark messages for translation 2016-09-21 10:20:43 -07:00
git-submodule.sh clone: pass --progress decision to recursive submodules 2016-09-22 11:22:47 -07:00
git-svn.perl
GIT-VERSION-GEN Git 2.10.1 2016-10-03 13:24:18 -07:00
git-web--browse.sh
git.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
git.rc
gpg-interface.c Merge branch 'lt/gpg-show-long-key-in-signature-verification-maint' into lt/gpg-show-long-key-in-signature-verification 2016-08-16 15:04:13 -07:00
gpg-interface.h
graph.c graph: add support for --line-prefix on all graph-aware output 2016-08-31 18:07:09 -07:00
graph.h graph: add support for --line-prefix on all graph-aware output 2016-08-31 18:07:09 -07:00
grep.c Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
grep.h
hashmap.c
hashmap.h
help.c
help.h
hex.c Merge branch 'rs/hex2chr' into maint 2016-09-19 13:51:43 -07:00
http-backend.c Merge branch 'ew/http-backend-batch-headers' 2016-08-12 09:47:38 -07:00
http-fetch.c
http-push.c Merge branch 'jk/common-main' into maint 2016-09-08 21:35:51 -07:00
http-walker.c
http.c Merge branch 'ew/http-do-not-forget-to-call-curl-multi-remove-handle' into maint 2016-09-29 16:49:39 -07:00
http.h
ident.c Merge branch 'jk/ident-ai-canonname-could-be-null' into maint 2016-10-03 13:22:32 -07:00
imap-send.c
INSTALL
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h mingw: ensure temporary file handles are not inherited by child processes 2016-08-23 09:09:55 -07:00
log-tree.c graph: add support for --line-prefix on all graph-aware output 2016-08-31 18:07:09 -07:00
log-tree.h
mailinfo.c Merge branch 'kd/mailinfo-quoted-string' 2016-10-03 13:30:38 -07:00
mailinfo.h mailinfo: handle in-body header continuations 2016-09-21 10:23:11 -07:00
mailmap.c
mailmap.h
Makefile Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'rs/cocci' 2016-09-26 16:09:14 -07:00
merge-recursive.h
merge.c sequencer: lib'ify checkout_fast_forward() 2016-09-09 11:24:52 -07:00
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'va/i18n-more' 2016-09-26 16:09:18 -07:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c notes: convert init_notes to use struct object_id 2016-09-07 12:59:42 -07:00
notes.h
object.c
object.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c Merge branch 'jk/verify-packfile-gently' 2016-09-29 16:57:13 -07:00
pack-objects.c
pack-objects.h
pack-revindex.c use COPY_ARRAY 2016-09-25 16:44:13 -07:00
pack-revindex.h
pack-write.c
pack.h
pager.c Merge branch 'jk/setup-sequence-update' 2016-09-21 15:15:24 -07:00
parse-options-cb.c Merge branch 'mh/diff-indent-heuristic' 2016-09-26 16:09:16 -07:00
parse-options.c
parse-options.h Merge branch 'mh/diff-indent-heuristic' 2016-09-26 16:09:16 -07:00
patch-delta.c
patch-ids.c patch-ids: refuse to compute patch-id for merge commit 2016-09-12 13:45:01 -07:00
patch-ids.h rebase: avoid computing unnecessary patch IDs 2016-08-11 14:39:16 -07:00
path.c Merge branch 'jk/diff-submodule-diff-inline' 2016-09-12 15:34:31 -07:00
pathspec.c use COPY_ARRAY 2016-09-25 16:44:13 -07:00
pathspec.h Merge branch 'bw/pathspec-remove-unused-extern-decl' into maint 2016-09-29 16:49:34 -07:00
pkt-line.c introduce hex2chr() for converting two hexadecimal digits to a character 2016-09-07 10:42:46 -07:00
pkt-line.h
preload-index.c
pretty.c Merge branch 'rs/c-auto-resets-attributes' 2016-09-26 16:09:15 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'tg/add-chmod+x-fix' into maint 2016-09-29 16:49:47 -07:00
README.md
ref-filter.c introduce hex2chr() for converting two hexadecimal digits to a character 2016-09-07 10:42:46 -07:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'bc/object-id' 2016-09-19 13:47:19 -07:00
refs.h Merge branch 'bc/object-id' 2016-09-19 13:47:19 -07:00
RelNotes Start preparing for 2.10.1 2016-09-19 13:54:50 -07:00
remote-curl.c
remote-testsvn.c
remote.c use strbuf_addstr() for adding constant strings to a strbuf, part 2 2016-09-15 12:23:38 -07:00
remote.h Merge branch 'jk/push-force-with-lease-creation' into maint 2016-09-08 21:35:53 -07:00
replace_object.c
rerere.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
rerere.h
resolve-undo.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
resolve-undo.h
revision.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
revision.h
run-command.c Merge branch 'ab/hooks' 2016-08-19 15:34:16 -07:00
run-command.h
send-pack.c
send-pack.h
sequencer.c sequencer: ensure to release the lock when we could not read the index 2016-09-09 11:24:52 -07:00
sequencer.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c sha1_file: always allow relative paths to alternates 2016-10-10 13:52:37 -07:00
sha1_name.c alternates: store scratch buffer as strbuf 2016-10-10 13:52:36 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c use COPY_ARRAY 2016-09-25 16:44:13 -07:00
split-index.h
strbuf.c link_alt_odb_entry: handle normalize_path errors 2016-10-10 13:52:36 -07:00
strbuf.h link_alt_odb_entry: handle normalize_path errors 2016-10-10 13:52:36 -07:00
streaming.c Merge branch 'jc/verify-loose-object-header' 2016-10-03 13:30:36 -07:00
streaming.h streaming: make stream_blob_to_fd take struct object_id 2016-09-07 12:59:42 -07:00
string-list.c
string-list.h
submodule-config.c
submodule-config.h
submodule.c alternates: provide helper for adding to alternates list 2016-10-10 13:52:36 -07:00
submodule.h diff: teach diff to display submodule difference with an inline diff 2016-08-31 18:07:10 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c mingw: ensure temporary file handles are not inherited by child processes 2016-08-23 09:09:55 -07:00
tempfile.h mingw: ensure temporary file handles are not inherited by child processes 2016-08-23 09:09:55 -07:00
thread-utils.c
thread-utils.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c Spelling fixes 2016-08-11 14:35:42 -07:00
transport.c alternates: use a separate scratch space 2016-10-10 13:52:36 -07:00
transport.h
tree-diff.c
tree-walk.c fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
tree-walk.h fsck: handle bad trees like other errors 2016-09-27 14:09:10 -07:00
tree.c cache: convert struct cache_entry to use struct object_id 2016-09-07 12:59:42 -07:00
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint 2016-09-29 16:49:36 -07:00
unpack-trees.h
update_unicode.sh
upload-pack.c Merge branch 'jk/common-main' into maint 2016-09-08 21:35:51 -07:00
url.c introduce hex2chr() for converting two hexadecimal digits to a character 2016-09-07 10:42:46 -07:00
url.h
urlmatch.c
urlmatch.h
usage.c Merge branch 'cc/apply-am' 2016-09-19 13:47:18 -07:00
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'rs/cocci' 2016-09-26 16:09:14 -07:00
wt-status.h
xdiff-interface.c Merge branch 'js/regexec-buf' into maint 2016-09-29 16:49:45 -07:00
xdiff-interface.h Convert read_mmblob to take struct object_id. 2016-09-07 12:59:42 -07:00
zlib.c

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 http://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-.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). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are available at http://news.gmane.org/gmane.comp.version-control.git/, http://marc.info/?l=git and other archival sites.

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