Go to file

Eric Sunshine 59d876ccd6 init: make --separate-git-dir work from within linked worktree The intention of `git init --separate-work-dir=<path>` is to move the .git/ directory to a location outside of the main worktree. When used within a linked worktree, however, rather than moving the .git/ directory as intended, it instead incorrectly moves the worktree's .git/worktrees/<id> directory to <path>, thus disconnecting the linked worktree from its parent repository and breaking the worktree in the process since its local .git file no longer points at a location at which it can find the object database. Fix this broken behavior. An intentional side-effect of this change is that it also closes a loophole not caught by `ccf236a23a` (init: disallow --separate-git-dir with bare repository, 2020-08-09) in which the check to prevent --separate-git-dir being used in conjunction with a bare repository was unable to detect the invalid combination when invoked from within a linked worktree. Therefore, add a test to verify that this loophole is closed, as well. Reported-by: Henré Botha <henrebotha@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2020-08-31 11:47:45 -07:00
.github	Merge branch 'ss/cmake-build'	2020-08-11 18:04:13 -07:00
Documentation	worktree: teach "repair" to fix outgoing links to worktrees	2020-08-31 11:47:45 -07:00
block-sha1	…
builtin	init: make --separate-git-dir work from within linked worktree	2020-08-31 11:47:45 -07:00
ci	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
compat	Merge branch 'jh/mingw-unlink'	2020-08-19 16:14:53 -07:00
contrib	Merge branch 'dl/subtree-docs'	2020-08-24 14:54:33 -07:00
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
perl	…
po	…
ppc	…
refs	…
sha1collisiondetection@855827c583	…
sha1dc	…
sha256	…
t	init: make --separate-git-dir work from within linked worktree	2020-08-31 11:47:45 -07:00
templates	…
trace2	…
vcs-svn	…
xdiff	…
.cirrus.yml	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	…
.travis.yml	…
.tsan-suppressions	…
CODE_OF_CONDUCT.md	…
COPYING	…
GIT-VERSION-GEN	…
INSTALL	…
LGPL-2.1	…
Makefile	…
README.md	…
RelNotes	…
abspath.c	…
aclocal.m4	…
add-interactive.c	…
add-interactive.h	…
add-patch.c	Merge branch 'jk/strvec'	2020-08-10 10:23:57 -07:00
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'rp/apply-cached-with-i-t-a'	2020-08-17 17:02:46 -07:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
attr.c	…
attr.h	…
banned.h	…
base85.c	…
bisect.c	Merge branch 'al/bisect-first-parent'	2020-08-17 17:02:45 -07:00
bisect.h	bisect: combine args passed to find_bisection()	2020-08-07 15:13:03 -07:00
blame.c	blame: only coalesce lines that are adjacent in result	2020-08-13 10:09:38 -07:00
blame.h	…
blob.c	…
blob.h	…
bloom.c	…
bloom.h	…
branch.c	…
branch.h	…
bugreport.c	stop calling UNLEAK() before die()	2020-08-13 11:04:58 -07:00
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
bundle.h	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
cache-tree.c	…
cache-tree.h	…
cache.h	…
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	Merge branch 'jk/strvec'	2020-08-10 10:23:57 -07:00
column.h	…
combine-diff.c	…
command-list.txt	command-list.txt: add missing 'gitcredentials' and 'gitremote-helpers'	2020-08-04 18:34:01 -07:00
commit-graph.c	commit-graph: use the "hash version" byte	2020-08-17 16:45:14 -07:00
commit-graph.h	…
commit-reach.c	…
commit-reach.h	…
commit-slab-decl.h	…
commit-slab-impl.h	…
commit-slab.h	…
commit.c	…
commit.h	…
common-main.c	…
config.c	…
config.h	…
config.mak.dev	…
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connect.h	…
connected.c	Merge branch 'rs/more-buffered-io'	2020-08-24 14:54:31 -07:00
connected.h	…
convert.c	…
convert.h	…
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	…
date.c	…
decorate.c	…
decorate.h	…
delta-islands.c	…
delta-islands.h	…
delta.h	…
detect-compiler	…
diff-delta.c	…
diff-lib.c	diff-lib: use worktree mode in diffs from i-t-a entries	2020-08-09 11:14:29 -07:00
diff-no-index.c	…
diff.c	Merge branch 'rs/patch-id-with-incomplete-line'	2020-08-24 14:54:33 -07:00
diff.h	…
diffcore-break.c	…
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	…
diffcore-rename.c	…
diffcore.h	…
dir-iterator.c	…
dir-iterator.h	…
dir.c	Merge branch 'en/dir-clear'	2020-08-24 14:54:34 -07:00
dir.h	dir: fix problematic API to avoid memory leaks	2020-08-18 17:17:31 -07:00
editor.c	…
entry.c	checkout_entry(): remove unreachable error() call	2020-08-18 13:26:10 -07:00
environment.c	…
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-pack.c	…
fetch-pack.h	…
fmt-merge-msg.c	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	Merge branch 'jk/strvec'	2020-08-10 10:23:57 -07:00
fsmonitor.h	…
fuzz-commit-graph.c	…
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
generate-configlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	Merge branch 'al/bisect-first-parent'	2020-08-17 17:02:45 -07:00
git-compat-util.h	compat-util: type-check parameters of no-op replacement functions	2020-08-06 17:25:37 -07:00
git-cvsexportcommit.perl	git-cvsexportcommit: support Perl before 5.10.1	2020-08-05 17:32:39 -07:00
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-parse-remote.sh	…
git-quiltimport.sh	…
git-rebase--preserve-merges.sh	rebase: remove unused function reschedule_last_action	2020-08-12 12:25:42 -07:00
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.c	…
git.rc	…
gpg-interface.c	…
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.h	…
hashmap.c	…
hashmap.h	…
help.c	help: drop usage of 'common' and 'useful' for guides	2020-08-04 18:34:01 -07:00
help.h	help: drop usage of 'common' and 'useful' for guides	2020-08-04 18:34:01 -07:00
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
imap-send.c	…
interdiff.c	…
interdiff.h	…
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	Merge branch 'tb/upload-pack-filters'	2020-08-11 18:04:13 -07:00
list-objects-filter-options.h	…
list-objects-filter.c	…
list-objects-filter.h	…
list-objects.c	…
list-objects.h	…
list.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
lockfile.h	…
log-tree.c	…
log-tree.h	…
ls-refs.c	…
ls-refs.h	…
mailinfo.c	…
mailinfo.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
mem-pool.c	…
mem-pool.h	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	Merge branch 'en/eol-attrs-gotchas'	2020-08-10 10:24:02 -07:00
merge-recursive.h	…
merge.c	dir: fix problematic API to avoid memory leaks	2020-08-18 17:17:31 -07:00
mergesort.c	…
mergesort.h	…
midx.c	Merge branch 'rs/more-buffered-io'	2020-08-24 14:54:31 -07:00
midx.h	…
name-hash.c	…
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes-utils.c	…
notes-utils.h	…
notes.c	…
notes.h	…
object-store.h	sha1-file: introduce no-lazy-fetch has_object()	2020-08-06 13:01:02 -07:00
object.c	…
object.h	…
oid-array.c	…
oid-array.h	…
oidmap.c	…
oidmap.h	…
oidset.c	…
oidset.h	…
pack-bitmap-write.c	…
pack-bitmap.c	…
pack-bitmap.h	…
pack-check.c	…
pack-objects.c	…
pack-objects.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
packfile.c	…
packfile.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	messages: avoid SHA-1 in end-user facing messages	2020-08-14 09:33:37 -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	…
pretty.c	…
pretty.h	…
prio-queue.c	…
prio-queue.h	…
progress.c	Merge branch 'ma/stop-progress-null-fix'	2020-08-17 17:02:48 -07:00
progress.h	…
promisor-remote.c	…
promisor-remote.h	…
prompt.c	…
prompt.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.c	…
rebase-interactive.c	…
rebase-interactive.h	…
rebase.c	…
rebase.h	…
ref-filter.c	Merge branch 'jk/strvec'	2020-08-10 10:23:57 -07:00
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	Merge branch 'hn/reftable-prep-part-2'	2020-08-17 17:02:42 -07:00
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	Merge branch 'jk/strvec'	2020-08-10 10:23:57 -07:00
remote-testsvn.c	…
remote.c	…
remote.h	…
replace-object.c	…
replace-object.h	…
repo-settings.c	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
reset.c	…
reset.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'so/log-diff-merges-opt'	2020-08-17 17:02:50 -07:00
revision.h	Merge branch 'jk/log-fp-implies-m'	2020-08-17 17:02:49 -07:00
run-command.c	…
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Merge branch 'ak/sequencer-fix-find-uniq-abbrev'	2020-08-19 16:14:48 -07:00
sequencer.h	…
serve.c	…
serve.h	…
server-info.c	…
setup.c	Merge branch 'bc/sha-256-part-3'	2020-08-11 18:04:11 -07:00
sh-i18n--envsubst.c	…
sha1-file.c	Merge branch 'jt/has_object'	2020-08-13 14:13:39 -07:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	…
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shallow.h	…
shell.c	…
shortlog.h	…
sideband.c	sideband: mark "remote error:" prefix for translation	2020-08-07 12:01:57 -07:00
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
stable-qsort.c	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
strvec.c	…
strvec.h	…
sub-process.c	…
sub-process.h	…
submodule-config.c	…
submodule-config.h	…
submodule.c	…
submodule.h	…
symlinks.c	…
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	…
trace2.h	…
trailer.c	…
trailer.h	…
transport-helper.c	…
transport-internal.h	…
transport.c	…
transport.h	…
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unicode-width.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	…
unpack-trees.h	…
upload-pack.c	Merge branch 'rs/more-buffered-io'	2020-08-24 14:54:31 -07:00
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	userdiff: improve Fortran xfuncname regex	2020-08-13 11:21:18 -07:00
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: teach "repair" to fix outgoing links to worktrees	2020-08-31 11:47:45 -07:00
worktree.h	worktree: teach "repair" to fix outgoing links to worktrees	2020-08-31 11:47:45 -07:00
wrap-for-bin.sh	…
wrapper.c	…
write-or-die.c	…
ws.c	…
wt-status.c	dir: fix problematic API to avoid memory leaks	2020-08-18 17:17:31 -07:00
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	Replace all die("BUG: ...") calls by BUG() ones	2018-05-06 19:06:13 +09:00

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). 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 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