Git with broken hash generation to generate collisions between object IDs. Don't use this! https://undefinedbehavior.de/posts/commit-vandalism/
Go to file
Stefan Beller da62f786d2 submodule: fixup nested submodules after moving the submodule
connect_work_tree_and_git_dir is used to connect a submodule worktree with
its git directory and vice versa after events that require a reconnection
such as moving around the working tree. As submodules can have nested
submodules themselves, we'd also want to fix the nested submodules when
asked to. Add an option to recurse into the nested submodules and connect
them as well.

As submodules are identified by their name (which determines their git
directory in relation to their superproject's git directory) internally
and by their path in the working tree of the superproject, we need to
make sure that the mapping of name <-> path is kept intact. We can do
that in the git-mv command by writing out the gitmodules file first
and then forcing a reload of the submodule config machinery.

Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-03-29 09:44:51 -07:00
.github
block-sha1
builtin submodule: fixup nested submodules after moving the submodule 2018-03-29 09:44:51 -07:00
ci Merge branch 'sg/travis-linux32-sanity' 2018-02-13 13:39:16 -08:00
compat Merge branch 'bp/fsmonitor' 2017-11-21 14:07:50 +09:00
contrib Merge branch 'nd/list-merge-strategy' 2018-02-13 13:39:15 -08:00
Documentation submodule-config: allow submodule_free to handle arbitrary repositories 2018-03-29 09:44:50 -07:00
ewah
git-gui Merge branch 'js/misc-git-gui-stuff' of ../git-gui 2018-01-09 11:07:03 -08:00
gitk-git
gitweb
mergetools
perl Merge branch 'ab/simplify-perl-makefile' 2018-02-13 13:39:03 -08:00
po l10n: de.po: translate 72 new messages 2018-01-15 07:47:30 +01:00
ppc
refs Merge branch 'sg/cocci-move-array' 2018-02-13 13:39:13 -08:00
sha1collisiondetection@19d97bf5af
sha1dc
t submodule: fixup nested submodules after moving the submodule 2018-03-29 09:44:51 -07:00
templates
vcs-svn
xdiff Merge branch 'jt/diff-anchored-patience' 2017-12-19 11:33:56 -08:00
.clang-format clang-format: adjust penalty for return type line break 2018-01-24 13:42:04 -08:00
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml travis-ci: don't install default addon packages for the 32 bit Linux build 2017-12-27 12:14:39 -08:00
.tsan-suppressions
abspath.c
aclocal.m4
advice.c Merge branch 'ls/editor-waiting-message' 2017-12-19 11:33:59 -08:00
advice.h Merge branch 'ls/editor-waiting-message' 2017-12-19 11:33:59 -08:00
alias.c
alloc.c
apply.c convert_to_git(): safe_crlf/checksafe becomes int conv_flags 2018-01-16 12:35:56 -08:00
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c Merge branch 'ys/bisect-object-id-missing-conversion-fix' 2018-01-23 13:16:40 -08:00
bisect.h Merge branch 'ma/bisect-leakfix' 2017-11-15 12:14:28 +09:00
blame.c
blame.h
blob.c
blob.h
branch.c Merge branch 'ks/branch-cleanup' 2017-12-27 11:16:25 -08:00
branch.h Merge branch 'ks/branch-cleanup' 2017-12-27 11:16:25 -08:00
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c Merge branch 'rs/lose-leak-pending' 2018-01-23 13:16:36 -08:00
bundle.h
cache-tree.c Merge branch 'sg/cocci-move-array' 2018-02-13 13:39:13 -08:00
cache-tree.h
cache.h sha1_file: add repository argument to map_sha1_file 2018-03-26 10:05:55 -07:00
check_bindir
check-builtins.sh
check-racy.c
checkout.c checkout: factor out functions to new lib file 2017-11-27 09:48:06 +09:00
checkout.h checkout: factor out functions to new lib file 2017-11-27 09:48:06 +09:00
color.c refactor "dumb" terminal determination 2017-12-04 09:38:30 -08:00
color.h
column.c
column.h
combine-diff.c Merge branch 'tb/crlf-conv-flags' 2018-02-13 13:39:08 -08:00
command-list.txt
commit-slab.h
commit.c Merge branch 'sg/cocci-move-array' 2018-02-13 13:39:13 -08:00
commit.h Merge branch 'rs/lose-leak-pending' 2018-01-23 13:16:36 -08:00
common-main.c repository: initialize the_repository in main() 2018-03-05 11:14:03 -08:00
config.c Merge branch 'tb/crlf-conv-flags' 2018-02-13 13:39:08 -08:00
config.h Merge branch 'hm/config-parse-expiry-date' 2017-12-06 09:23:37 -08:00
config.mak.in
config.mak.uname
configure.ac Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1 2017-12-28 11:55:56 -08:00
connect.c connect: correct style of C-style comment 2017-11-21 14:01:03 +09:00
connect.h
connected.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
connected.h
convert.c convert_to_git(): safe_crlf/checksafe becomes int conv_flags 2018-01-16 12:35:56 -08:00
convert.h convert_to_git(): safe_crlf/checksafe becomes int conv_flags 2018-01-16 12:35:56 -08:00
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 daemon: fix length computation in newline stripping 2018-01-25 13:50:17 -08:00
date.c
decorate.c decorate: clean up and document API 2017-12-08 09:16:27 -08:00
decorate.h decorate: clean up and document API 2017-12-08 09:16:27 -08:00
delta.h
diff-delta.c
diff-lib.c Merge branch 'bc/hash-algo' 2017-12-13 13:28:54 -08:00
diff-no-index.c
diff.c Merge branch 'nd/diff-flush-before-warning' 2018-02-13 13:39:09 -08:00
diff.h Merge branch 'sb/diff-blobfind-pickaxe' 2018-01-23 13:16:37 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diff: properly error out when combining multiple pickaxe options 2018-01-04 15:02:40 -08:00
diffcore-rename.c Use MOVE_ARRAY 2018-01-22 11:32:51 -08:00
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c submodule: fixup nested submodules after moving the submodule 2018-03-29 09:44:51 -07:00
dir.h submodule: fixup nested submodules after moving the submodule 2018-03-29 09:44:51 -07:00
editor.c launch_editor(): indicate that Git waits for user input 2017-12-07 10:10:19 -08:00
entry.c Merge branch 'bp/fsmonitor' 2017-11-21 14:07:50 +09:00
environment.c repository: introduce raw object store field 2018-03-23 11:06:01 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
fetch-object.c unpack-trees: batch fetching of missing blobs 2017-12-08 09:58:51 -08:00
fetch-object.h unpack-trees: batch fetching of missing blobs 2017-12-08 09:58:51 -08:00
fetch-pack.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
fetch-pack.h fetch-pack, index-pack, transport: partial clone 2017-12-08 09:58:51 -08:00
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor.c
fsmonitor.h
generate-cmdlist.sh generate-cmdlist: avoid non-deterministic output 2017-11-22 14:56:30 +09:00
gettext.c
gettext.h
git-add--interactive.perl add--interactive: ignore submodule changes except HEAD 2018-01-16 12:32:45 -08:00
git-archimport.perl
git-bisect.sh Merge branch 'sb/bisect-run-empty' 2017-11-15 12:14:36 +09:00
git-compat-util.h git-compat-util: introduce skip_to_optional_arg() 2017-12-11 16:10:12 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: apply shell-quoting regex globally 2017-12-08 09:02:54 -08:00
git-cvsserver.perl cvsserver: use safe_pipe_capture for constant commands as well 2017-09-11 14:52:29 +09:00
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-p4: update multiple shelved change lists 2017-12-22 13:30:52 -08:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh rebase: use mboxrd format to avoid split errors 2017-11-18 12:30:16 +09:00
git-rebase--interactive.sh Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' 2018-01-10 14:01:24 -08:00
git-rebase--merge.sh
git-rebase.sh rebase: rebasing can also be done when HEAD is detached 2017-12-19 10:02:47 -08:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'ab/simplify-perl-makefile' 2018-02-13 13:39:03 -08:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'tg/stash-with-pathspec-fix' 2018-01-23 13:16:39 -08:00
git-submodule.sh submodule: port submodule subcommand 'deinit' from shell to C 2018-01-16 11:29:50 -08:00
git-svn.perl Merge branch 'ew/svn-branch-segfault-fix' 2018-02-13 13:39:16 -08:00
GIT-VERSION-GEN Git 2.16.1 2018-01-21 21:14:25 -08:00
git-web--browse.sh
git.c Merge branch 'ma/branch-list-paginate' 2017-11-28 13:41:50 +09:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'ab/pcre2-grep' 2017-12-13 13:28:54 -08:00
grep.h Merge branch 'ab/pcre-v2' into maint 2017-11-21 14:05:30 +09:00
hash.h
hashmap.c
hashmap.h Merge branch 'rb/hashmap-h-compilation-fix' 2018-02-13 13:39:10 -08:00
help.c version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
help.h
hex.c
http-backend.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
http-fetch.c
http-push.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
http-walker.c sha1_file: add repository argument to sha1_file_name 2018-03-26 10:05:55 -07:00
http.c sha1_file: add repository argument to sha1_file_name 2018-03-26 10:05:55 -07:00
http.h
ident.c
imap-send.c imap-send: URI encode server folder 2017-12-18 13:57:06 -08:00
INSTALL Makefile: replace perl/Makefile.PL with simple make rules 2017-12-11 15:28:10 -08:00
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-filter-options.c fetch: inherit filter-spec from partial clone 2017-12-08 09:58:52 -08:00
list-objects-filter-options.h fetch: inherit filter-spec from partial clone 2017-12-08 09:58:52 -08:00
list-objects-filter.c list-objects: filter objects in traverse_commit_list 2017-11-22 14:11:57 +09:00
list-objects-filter.h list-objects: filter objects in traverse_commit_list 2017-11-22 14:11:57 +09:00
list-objects.c Merge branch 'jh/fsck-promisors' 2018-02-13 13:39:03 -08:00
list-objects.h list-objects: filter objects in traverse_commit_list 2017-11-22 14:11:57 +09:00
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
log-tree.h log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
mailinfo.c Merge branch 'jc/mailinfo-cleanup-fix' 2018-02-13 13:39:14 -08:00
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'gs/retire-mru' 2018-02-13 13:39:06 -08:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'jc/merge-symlink-ours-theirs' 2018-01-23 13:16:37 -08:00
merge-recursive.h
merge.c Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index 2017-12-22 12:48:38 -08:00
mergesort.c
mergesort.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: allow map_sha1_file to handle arbitrary repositories 2018-03-26 10:05:55 -07:00
object.c object-store: close all packs upon clearing the object store 2018-03-26 10:05:55 -07:00
object.h Merge branch 'rs/lose-leak-pending' 2018-01-23 13:16:36 -08:00
oidmap.c oidmap: ensure map is initialized 2017-12-27 12:28:06 -08:00
oidmap.h oidmap: add oidmap iterator methods 2017-11-22 14:11:56 +09:00
oidset.c oidset: add iterator methods to oidset 2017-11-22 14:11:56 +09:00
oidset.h oidset: don't return value from oidset_init 2018-01-08 15:24:35 -08:00
pack-bitmap-write.c
pack-bitmap.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
pack-bitmap.h
pack-check.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
pack-objects.c
pack-objects.h
pack-revindex.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
pack-revindex.h
pack-write.c
pack.h
packfile.c sha1_file: add repository argument to prepare_alt_odb 2018-03-26 10:05:55 -07:00
packfile.h object-store: close all packs upon clearing the object store 2018-03-26 10:05:55 -07:00
pager.c
parse-options-cb.c
parse-options.c Use MOVE_ARRAY 2018-01-22 11:32:51 -08:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c repository: introduce raw object store field 2018-03-23 11:06:01 -07:00
path.h path: document path functions 2017-12-13 11:14:25 -08:00
pathspec.c
pathspec.h Merge branch 'bw/pathspec-match-submodule-boundary' 2017-12-19 11:33:56 -08:00
pkt-line.c Merge branch 'bw/protocol-v1' 2017-12-06 09:23:44 -08:00
pkt-line.h
preload-index.c
pretty.c log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
pretty.h format: create docs for pretty.h 2017-12-12 10:41:15 -08:00
prio-queue.c
prio-queue.h
progress.c Merge branch 'en/rename-progress' 2017-12-19 11:33:55 -08:00
progress.h progress: fix progress meters when dealing with lots of work 2017-11-15 13:11:25 +09:00
prompt.c
prompt.h
protocol.c
protocol.h
quote.c trace: avoid unnecessary quoting 2018-01-16 12:16:54 -08:00
quote.h trace: avoid unnecessary quoting 2018-01-16 12:16:54 -08:00
reachable.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
reachable.h
read-cache.c Merge branch 'nd/shared-index-fix' 2018-02-13 13:39:14 -08:00
README.md
ref-filter.c Merge branch 'rs/lose-leak-pending' 2018-01-23 13:16:36 -08:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
refs.h log: add option to choose which refs to decorate 2017-11-22 13:18:59 +09:00
RelNotes Git 2.16.1 2018-01-21 21:14:25 -08:00
remote-curl.c fetch: support filters 2017-12-08 09:58:51 -08:00
remote-testsvn.c
remote.c Merge branch 'js/for-each-ref-remote-name-and-ref' 2017-11-15 12:14:32 +09:00
remote.h
replace_object.c Use MOVE_ARRAY 2018-01-22 11:32:51 -08:00
repository.c submodule: fixup nested submodules after moving the submodule 2018-03-29 09:44:51 -07:00
repository.h submodule: fixup nested submodules after moving the submodule 2018-03-29 09:44:51 -07:00
rerere.c Use MOVE_ARRAY 2018-01-22 11:32:51 -08:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'tg/split-index-fixes' 2018-02-13 13:39:13 -08:00
revision.h Merge branch 'jh/fsck-promisors' 2018-02-13 13:39:03 -08:00
run-command.c run-command.c: print new cwd in trace_run_command() 2018-01-19 10:49:20 -08:00
run-command.h
send-pack.c send-pack: use internal argv_array of struct child_process 2017-12-22 13:33:53 -08:00
send-pack.h
sequencer.c Merge branch 'pw/sequencer-in-process-commit' 2018-02-13 13:39:15 -08:00
sequencer.h Merge branch 'pw/sequencer-in-process-commit' 2018-02-13 13:39:15 -08:00
server-info.c object-store: move packed_git and packed_git_mru to object store 2018-03-26 10:05:46 -07:00
setup.c repository.c: move env-related setup code back to environment.c 2018-03-05 11:14:03 -08:00
sh-i18n--envsubst.c
sha1_file.c sha1_file: allow sha1_loose_object_info to handle arbitrary repositories 2018-03-26 10:05:55 -07:00
sha1_name.c sha1_file: add repository argument to prepare_alt_odb 2018-03-26 10:05:55 -07:00
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1dc_git.c
sha1dc_git.h
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c refactor "dumb" terminal determination 2017-12-04 09:38:30 -08:00
sideband.h
sigchain.c
sigchain.h
split-index.c split-index: don't write cache tree with null oid entries 2018-01-19 10:36:39 -08:00
split-index.h
strbuf.c Merge branch 'jd/fix-strbuf-add-urlencode-bytes' 2018-01-05 13:28:10 -08:00
strbuf.h strbuf: remove unused stripspace function alias 2017-12-05 08:50:15 -08:00
streaming.c sha1_file: add repository argument to map_sha1_file 2018-03-26 10:05:55 -07:00
streaming.h
string-list.c
string-list.h
sub-process.c
sub-process.h Docs: split out long-running subprocess handshake 2018-01-25 11:24:32 -08:00
submodule-config.c submodule-config: remove submodule_from_cache 2018-03-29 09:44:51 -07:00
submodule-config.h submodule-config: remove submodule_from_cache 2018-03-29 09:44:51 -07:00
submodule.c submodule: fixup nested submodules after moving the submodule 2018-03-29 09:44:51 -07:00
submodule.h submodule.h: drop declaration of connect_work_tree_and_git_dir 2018-03-29 09:44:50 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c object-store: migrate alternates struct and functions from cache.h 2018-03-23 11:06:01 -07:00
tmp-objdir.h
trace.c trace.c: move strbuf_release() out of print_trace_line() 2018-01-16 12:16:54 -08:00
trace.h trace: improve performance while category is disabled 2017-12-06 09:43:02 -08:00
trailer.c
trailer.h
transport-helper.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
transport-internal.h transport: make transport vtable more private 2017-12-14 14:28:04 -08:00
transport.c object-store: migrate alternates struct and functions from cache.h 2018-03-23 11:06:01 -07:00
transport.h Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
tree-diff.c
tree-walk.c Merge branch 'bw/pathspec-match-submodule-boundary' 2017-12-19 11:33:56 -08:00
tree-walk.h
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c submodule-config: allow submodule_free to handle arbitrary repositories 2018-03-29 09:44:50 -07:00
unpack-trees.h
upload-pack.c Merge branch 'jh/partial-clone' 2018-02-13 13:39:04 -08:00
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 --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
version.h version --build-options: report commit, too, if possible 2017-12-14 22:53:04 -08:00
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c
worktree.h
wrap-for-bin.sh Makefile: replace perl/Makefile.PL with simple make rules 2017-12-11 15:28:10 -08:00
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'nd/ita-wt-renames-in-status' 2018-01-23 13:16:28 -08:00
wt-status.h Merge branch 'nd/ita-wt-renames-in-status' 2018-01-23 13:16:28 -08:00
xdiff-interface.c
xdiff-interface.h
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 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-.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://public-inbox.org/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