Go to file
Johannes Schindelin 1d1d69bc52 path: add is_ntfs_dotgit() helper
We do not allow paths with a ".git" component to be added to
the index, as that would mean repository contents could
overwrite our repository files. However, asking "is this
path the same as .git" is not as simple as strcmp() on some
filesystems.

On NTFS (and FAT32), there exist so-called "short names" for
backwards-compatibility: 8.3 compliant names that refer to the same files
as their long names. As ".git" is not an 8.3 compliant name, a short name
is generated automatically, typically "git~1".

Depending on the Windows version, any combination of trailing spaces and
periods are ignored, too, so that both "git~1." and ".git." still refer
to the Git directory. The reason is that 8.3 stores file names shorter
than 8 characters with trailing spaces. So literally, it does not matter
for the short name whether it is padded with spaces or whether it is
shorter than 8 characters, it is considered to be the exact same.

The period is the separator between file name and file extension, and
again, an empty extension consists just of spaces in 8.3 format. So
technically, we would need only take care of the equivalent of this
regex:
        (\.git {0,4}|git~1 {0,3})\. {0,3}

However, there are indications that at least some Windows versions might
be more lenient and accept arbitrary combinations of trailing spaces and
periods and strip them out. So we're playing it real safe here. Besides,
there can be little doubt about the intention behind using file names
matching even the more lenient pattern specified above, therefore we
should be fine with disallowing such patterns.

Extra care is taken to catch names such as '.\\.git\\booh' because the
backslash is marked as a directory separator only on Windows, and we want
to use this new helper function also in fsck on other platforms.

A big thank you goes to Ed Thomson and an unnamed Microsoft engineer for
the detailed analysis performed to come up with the corresponding fixes
for libgit2.

This commit adds a function to detect whether a given file name can refer
to the Git directory by mistake.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-12-17 11:04:45 -08:00
Documentation read-cache: optionally disallow HFS+ .git variants 2014-12-17 11:04:44 -08:00
block-sha1 block-sha1/sha1.c: have SP around arithmetic operators 2013-10-16 10:27:27 -07:00
builtin Merge branch 'nd/literal-pathspecs' 2013-11-18 14:31:29 -08:00
compat C: have space around && and || operators 2013-10-16 10:26:39 -07:00
contrib remote-hg: don't decode UTF-8 paths into Unicode objects 2013-11-27 12:09:50 -08:00
git-gui
gitk-git
gitweb Merge branch 'ab/gitweb-author-initials' 2013-09-17 11:42:27 -07:00
mergetools mergetools/diffmerge: support DiffMerge as a git mergetool 2013-10-13 16:00:57 -07:00
perl git-svn: fix termination issues for remote svn connections 2013-09-06 09:44:28 -07:00
po l10n: de.po: improve error message when pushing to unknown upstream 2013-11-12 06:31:15 +01:00
ppc
t fsck: complain about HFS+ ".git" aliases in trees 2014-12-17 11:04:45 -08:00
templates sample pre-commit hook: use --bool when retrieving config var 2013-09-24 12:26:49 -07:00
vcs-svn
xdiff C: have space around && and || operators 2013-10-16 10:26:39 -07:00
.gitattributes
.gitignore Merge branch 'jc/url-match' 2013-09-09 14:50:36 -07:00
.mailmap .mailmap: switch to Thomas Rast's personal address 2013-10-13 14:28:27 -07:00
COPYING
GIT-VERSION-GEN Git 1.8.5 2013-11-27 12:14:45 -08:00
INSTALL
LGPL-2.1
Makefile Merge branch 'sb/repack-in-c' 2013-10-18 13:49:57 -07:00
README
RelNotes Git 1.8.4.4 2013-11-20 11:26:08 -08:00
abspath.c abspath.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
aclocal.m4
advice.c Rename advice.object_name_warning to objectNameWarning 2013-07-31 15:20:07 -07:00
advice.h Merge branch 'jk/gcc-function-attributes' 2013-07-22 11:23:59 -07:00
alias.c alias: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
alloc.c alloc.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive-tar.c
archive-zip.c
archive.c archive.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c base85.c: have SP around arithmetic operators 2013-10-16 10:27:26 -07:00
bisect.c list-objects: reduce one argument in mark_edges_uninteresting 2013-08-28 11:54:18 -07:00
bisect.h
blob.c
blob.h
branch.c Merge branch 'jh/checkout-auto-tracking' into maint 2013-10-23 13:32:50 -07:00
branch.h
builtin.h repack: rewrite the shell script in C 2013-09-17 13:34:50 -07:00
bulk-checkin.c stream_to_pack: xread does not guarantee to read all requested bytes 2013-08-20 11:20:53 -07:00
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h path: add is_ntfs_dotgit() helper 2014-12-17 11:04:45 -08:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'tr/log-full-diff-keep-true-parents' into maint 2013-09-18 11:59:05 -07:00
command-list.txt
commit-slab.h commit-slab.h: Fix memory allocation and addressing 2013-07-29 08:44:29 -07:00
commit.c Merge branch 'tr/log-full-diff-keep-true-parents' into maint 2013-09-18 11:59:05 -07:00
commit.h Merge branch 'nd/fetch-into-shallow' into maint 2013-10-23 13:32:17 -07:00
config.c read-cache: optionally disallow HFS+ .git variants 2014-12-17 11:04:44 -08:00
config.mak.in
config.mak.uname read-cache: optionally disallow HFS+ .git variants 2014-12-17 11:04:44 -08:00
configure.ac
connect.c Merge branch 'jc/upload-pack-send-symref' 2013-10-30 12:10:06 -07:00
connect.h Merge branch 'jc/upload-pack-send-symref' 2013-10-30 12:10:06 -07:00
connected.c
connected.h
convert.c typofix: in-code comments 2013-07-22 16:06:49 -07:00
convert.h typofix: in-code comments 2013-07-22 16:06:49 -07:00
copy.c
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 'sb/misc-fixes' 2013-07-24 19:20:59 -07:00
date.c Merge branch 'jk/date-c-double-semicolon' 2013-10-30 12:11:01 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c create_delta_index: simplify condition always evaluating to true 2013-08-18 12:56:23 -07:00
diff-lib.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
diff-no-index.c Merge branch 'dw/diff-no-index-doc' 2013-09-17 11:42:44 -07:00
diff.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
diff.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c Merge branch 'jc/ls-files-killed-optim' into maint 2013-10-23 13:33:08 -07:00
dir.h Merge branch 'jc/ls-files-killed-optim' 2013-09-11 15:03:28 -07:00
editor.c editor: use canonicalized absolute path 2013-07-29 12:15:27 -07:00
entry.c checkout_entry(): clarify the use of topath[] parameter 2013-10-24 14:59:39 -07:00
environment.c read-cache: optionally disallow HFS+ .git variants 2014-12-17 11:04:44 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'bk/refs-multi-update' 2013-09-20 12:36:12 -07:00
fetch-pack.c Merge branch 'jl/pack-transfer-avoid-double-close' 2013-10-30 12:10:45 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c fsck: complain about HFS+ ".git" aliases in trees 2014-12-17 11:04:45 -08:00
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl add-interactive: handle unborn branch in patch mode 2013-10-25 14:54:17 -07:00
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h Windows: do not redefine _WIN32_WINNT 2013-09-11 14:50:19 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys' 2013-11-04 14:58:05 -08:00
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh Merge branch 'lc/filter-branch-too-many-refs' 2013-10-17 15:55:12 -07:00
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh mergetool--lib: Fix typo in the merge/difftool help 2013-10-14 16:28:38 -07:00
git-mergetool.sh
git-p4.py Merge branch 'ks/p4-view-spec' 2013-09-18 11:44:50 -07:00
git-parse-remote.sh
git-pull.sh Merge branch 'fc/trivial' 2013-09-17 11:42:34 -07:00
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'es/rebase-i-no-abbrev' into maint 2013-10-17 15:45:50 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'mm/rebase-continue-freebsd-WB' into maint 2013-09-26 12:41:14 -07:00
git-relink.perl
git-remote-testgit.sh transport-helper: add no-private-update capability 2013-09-03 11:57:53 -07:00
git-request-pull.sh
git-send-email.perl send-email: don't call methods on undefined values 2013-09-10 08:49:22 -07:00
git-sh-i18n.sh
git-sh-setup.sh Merge branch 'jc/reflog-doc' 2013-10-18 13:50:12 -07:00
git-stash.sh Revert "git stash: avoid data loss when "git stash save" kills a directory" 2013-08-14 09:53:43 -07:00
git-submodule.sh Merge branch 'bc/submodule-status-ignored' 2013-09-24 23:36:08 -07:00
git-svn.perl git-svn: Warn about changing default for --prefix in Git v2.0 2013-10-12 22:30:53 +00:00
git-web--browse.sh web--browse: Add support for xdg-open 2013-10-30 13:54:15 -07:00
git.c Merge branch 'sb/repack-in-c' 2013-10-18 13:49:57 -07:00
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c graph: fix coloring around octopus merges 2013-10-18 12:48:48 -07:00
graph.h
grep.c
grep.h
hash.c
hash.h
help.c
help.h
hex.c
http-backend.c Merge branch 'bc/http-backend-allow-405' into maint 2013-10-17 15:46:00 -07:00
http-fetch.c
http-push.c Merge branch 'jk/http-auth-redirects' into maint 2013-11-08 11:37:26 -08:00
http-walker.c
http.c Merge branch 'jk/http-auth-redirects' 2013-10-30 12:09:53 -07:00
http.h http: update base URLs when we see redirects 2013-10-14 16:56:47 -07:00
ident.c Merge branch 'jk/split-broken-ident' into maint 2013-11-07 14:34:51 -08:00
imap-send.c imap-send: use Apple's Security framework for base64 encoding 2013-07-30 08:53:24 -07:00
kwset.c typofix: in-code comments 2013-07-22 16:06:49 -07:00
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'nd/magic-pathspec' 2013-10-30 12:10:33 -07:00
line-log.h range-set: publish API for re-use by git-blame -L 2013-08-06 14:27:20 -07:00
line-range.c line-range: reject -L line numbers less than 1 2013-08-06 14:48:55 -07:00
line-range.h line-range: teach -L/RE/ to search relative to anchor point 2013-08-06 14:36:34 -07:00
list-objects.c Merge branch 'nd/fetch-into-shallow' 2013-09-20 12:25:32 -07:00
list-objects.h list-objects: reduce one argument in mark_edges_uninteresting 2013-08-28 11:54:18 -07:00
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c log: use true parents for diff even when rewriting 2013-08-01 10:25:48 -07:00
log-tree.h
mailmap.c Merge branch 'jc/strcasecmp-pure-inline' 2013-09-24 23:28:13 -07:00
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jk/diff-algo' into maint 2013-10-28 10:16:11 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c name-hash: stop storing trailing '/' on paths in index_state.dir_hash 2013-09-17 10:08:07 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h typofix: commit is spelled with two ems 2013-09-04 15:30:03 -07:00
notes.c
notes.h many small typofixes 2013-07-29 12:32:25 -07:00
object.c Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
object.h Merge branch 'mg/more-textconv' 2013-10-23 13:21:31 -07:00
pack-check.c
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c pager: turn on "cat" optimization for DEFAULT_PAGER 2013-09-03 10:36:12 -07:00
parse-options-cb.c
parse-options.c parse-options: add OPT_CMDMODE() 2013-07-30 12:23:31 -07:00
parse-options.h Merge branch 'sb/parseopt-boolean-removal' 2013-09-04 12:39:03 -07:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c path: add is_ntfs_dotgit() helper 2014-12-17 11:04:45 -08:00
pathspec.c pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
pathspec.h pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
pkt-line.c
pkt-line.h
preload-index.c
pretty.c pretty: trivial style fix 2013-10-31 13:47:41 -07:00
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
quote.h quote: remove sq_quote_print() 2013-07-30 08:13:38 -07:00
reachable.c
reachable.h
read-cache.c read-cache: optionally disallow HFS+ .git variants 2014-12-17 11:04:44 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
refs.h Merge branch 'sb/refs-code-cleanup' 2013-11-01 07:38:58 -07:00
remote-curl.c Merge branch 'jk/http-auth-redirects' 2013-10-30 12:09:53 -07:00
remote-testsvn.c
remote.c Merge branch 'jk/remote-literal-string-leakfix' 2013-10-28 10:43:28 -07:00
remote.h Merge branch 'jc/push-cas' 2013-09-09 14:30:29 -07:00
replace_object.c
rerere.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
rerere.h
resolve-undo.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
resolve-undo.h
revision.c Merge branch 'nd/literal-pathspecs' 2013-11-18 14:31:29 -08:00
revision.h revision: add missing include 2013-10-31 13:46:03 -07:00
run-command.c run-command: trivial style fixes 2013-10-31 13:48:26 -07:00
run-command.h
send-pack.c Merge branch 'jl/pack-transfer-avoid-double-close' 2013-10-30 12:10:45 -07:00
send-pack.h
sequencer.c refs: report ref type from lock_any_ref_for_update 2013-08-30 14:57:28 -07:00
sequencer.h
server-info.c
setup.c setup: trivial style fixes 2013-10-31 13:48:32 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP 2013-08-24 22:31:20 -07:00
sha1-lookup.h
sha1_file.c Sync with v1.8.4.2 2013-10-28 10:51:53 -07:00
sha1_name.c sha1-name: trivial style cleanup 2013-10-31 13:47:19 -07:00
shallow.c shallow: add setup_temporary_shallow() 2013-08-28 11:51:54 -07:00
shell.c Merge branch 'tr/protect-low-3-fds' 2013-07-22 11:23:35 -07:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c Merge branch 'jk/cat-file-batch-optim' 2013-07-24 19:21:21 -07:00
streaming.h
string-list.c
string-list.h
submodule.c Merge branch 'jl/some-submodule-config-are-not-boolean' into maint 2013-09-18 11:59:35 -07:00
submodule.h rm: delete .gitmodules entry of submodules removed from the work tree 2013-08-06 14:11:00 -07:00
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-genrandom.c
test-index-version.c
test-line-buffer.c
test-match-trees.c use 'tree-ish' instead of 'treeish' 2013-09-04 15:02:56 -07:00
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c path-utils test: rename mingw_path function to print_path 2013-10-14 07:32:53 -07:00
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c test-sha1: add a binary output mode 2013-08-22 16:39:46 -07:00
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c builtin/config.c: compilation fix 2013-08-09 09:20:38 -07:00
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c transport-helper: trivial style fix 2013-10-31 13:47:22 -07:00
transport.c Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' 2013-09-09 14:50:37 -07:00
transport.h Merge branch 'jc/transport-do-not-use-connect-twice-in-fetch' 2013-09-09 14:50:37 -07:00
tree-diff.c pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses 2013-10-28 09:57:36 -07:00
tree-walk.c Merge branch 'jl/submodule-mv' 2013-09-09 14:36:15 -07:00
tree-walk.h
tree.c Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
tree.h Merge branch 'jk/free-tree-buffer' 2013-09-17 11:37:33 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c unpack-trees: propagate errors adding entries to the index 2014-12-17 10:57:53 -08:00
unpack-trees.h
upload-pack.c Merge branch 'maint' 2013-11-18 12:25:28 -08:00
url.c
url.h
urlmatch.c urlmatch.c: recompute pointer after append_normalized_escapes 2013-09-12 15:27:01 -07:00
urlmatch.h config: add generic callback wrapper to parse section.<url>.key 2013-07-31 14:58:42 -07:00
usage.c
userdiff.c
userdiff.h
utf8.c utf8: add is_hfs_dotgit() helper 2014-12-17 11:04:39 -08:00
utf8.h utf8: add is_hfs_dotgit() helper 2014-12-17 11:04:39 -08:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c wrapper.c: only define gitmkstemps if needed 2013-10-14 16:16:00 -07:00
write_or_die.c
ws.c
wt-status.c status: show commit sha1 in "You are currently cherry-picking" message 2013-10-11 10:42:45 -07:00
wt-status.h status: show commit sha1 in "You are currently cherry-picking" message 2013-10-11 10:42:45 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.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).

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

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.