Go to file
Stefan Beller 2d94dd2fc6 submodule: correct error message for missing commits
When a submodule diff should be displayed we currently just add the
submodule objects to the main object store and then e.g. walk the
revision graph and create a summary for that submodule.

It is possible that we are missing the submodule either completely or
partially, which we currently differentiate with different error messages
depending on whether (1) the whole submodule object store is missing or
(2) just the needed for this particular diff. (1) is reported as
"not initialized", and (2) is reported as "commits not present".

If a submodule is deinit'ed its repository data is still around inside
the superproject, such that the diff can still be produced. In that way
the error message (1) is misleading as we can have a diff despite the
submodule being not initialized.

Downgrade the error message (1) to be the same as (2) and just say
the commits are not present, as that is the true reason why the diff
cannot be shown.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-28 14:15:20 +09:00
.github
Documentation Sync with 2.14.2 2017-09-26 14:15:55 +09:00
block-sha1
builtin Merge branch 'ow/rev-parse-is-shallow-repo' 2017-09-25 15:24:10 +09:00
ci travis-ci: fix "skip_branch_tip_with_tag()" string comparison 2017-09-22 10:58:29 +09:00
compat Merge branch 'rs/win32-syslog-leakfix' into maint 2017-09-10 17:02:54 +09:00
contrib Merge branch 'dw/diff-highlight-makefile-fix' 2017-09-19 10:47:50 +09:00
ewah
git-gui Merge branch 'ma/up-to-date' 2017-09-10 17:08:22 +09:00
gitk-git
gitweb Merge branch 'js/gitweb-raw-blob-link-in-history' 2017-08-26 22:55:07 -07:00
mergetools
perl Merge branch 'jc/perl-git-comment-typofix' into maint 2017-09-10 17:02:57 +09:00
po
ppc
refs Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
sha1collisiondetection@19d97bf5af
sha1dc
t submodule: correct error message for missing commits 2017-09-28 14:15:20 +09:00
templates Merge branch 'ma/up-to-date' 2017-09-10 17:08:22 +09:00
vcs-svn Merge branch 'jn/vcs-svn-cleanup' into maint 2017-09-10 17:03:09 +09:00
xdiff
.clang-format
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml travis-ci: move Travis CI code into dedicated scripts 2017-09-11 09:54:08 +09:00
.tsan-suppressions ThreadSanitizer: add suppressions 2017-08-23 10:38:56 -07:00
COPYING
GIT-VERSION-GEN Git 2.13.6 2017-09-22 14:49:24 +09:00
INSTALL
LGPL-2.1
Makefile Merge branch 'bw/git-clang-format' 2017-09-25 15:24:08 +09:00
README.md
RelNotes Git 2.13.6 2017-09-22 14:49:24 +09:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Merge branch 'rs/apply-epoch' 2017-09-10 17:08:25 +09:00
apply.h
archive-tar.c
archive-zip.c
archive.c Merge branch 'rs/archive-excluded-directory' 2017-09-25 15:24:07 +09:00
archive.h
argv-array.c
argv-array.h
attr.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
attr.h
base85.c
bisect.c
bisect.h
blame.c
blame.h
blob.c
blob.h
branch.c Merge branch 'nd/worktree-kill-parse-ref' 2017-09-10 17:08:24 +09:00
branch.h
builtin.h
bulk-checkin.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c stop leaking lock structs in some simple cases 2017-09-06 17:19:54 +09:00
cache-tree.h
cache.h pack: make packed_git_mru global a value instead of a pointer 2017-09-14 15:05:48 +09:00
check-builtins.sh
check-racy.c
check_bindir
color.c Merge branch 'ma/ts-cleanups' 2017-09-10 17:08:22 +09:00
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c Merge branch 'rs/strbuf-leakfix' 2017-09-19 10:47:57 +09:00
commit.h Merge branch 'po/read-graft-line' 2017-09-06 13:11:25 +09:00
common-main.c
config.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
config.h Merge branch 'ma/remove-config-maybe-bool' 2017-09-19 10:47:55 +09:00
config.mak.in
config.mak.uname
configure.ac
connect.c connect: release strbuf on error return in git_connect() 2017-09-07 08:49:27 +09:00
connect.h
connected.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
connected.h
convert.c Merge branch 'rs/strbuf-leakfix' 2017-09-19 10:47:57 +09:00
convert.h Merge branch 'tb/apply-with-crlf' into maint 2017-09-10 17:02:55 +09:00
copy.c
credential-cache--daemon.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
credential-cache.c Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint 2017-08-23 14:33:45 -07:00
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
diff.h diff: define block by number of alphanumeric chars 2017-08-16 11:44:00 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c Merge branch 'rs/stat-data-unaligned-reads-fix' into maint 2017-08-23 14:33:48 -07:00
dir.h
editor.c
entry.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
environment.c repository: free fields before overwriting them 2017-09-06 18:06:26 +09:00
exec_cmd.c git_extract_argv0_path: do nothing without RUNTIME_PREFIX 2017-09-07 09:41:14 +09:00
exec_cmd.h
fast-import.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
fetch-pack.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl archimport: use safe_pipe_capture for user input 2017-09-12 11:08:15 +09:00
git-bisect.sh
git-compat-util.h git-compat-util: make UNLEAK less error-prone 2017-09-20 15:00:41 +09:00
git-cvsexportcommit.perl
git-cvsimport.perl cvsimport: shell-quote variable used in backticks 2017-09-12 11:10:22 +09: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 Merge branch 'ma/up-to-date' 2017-09-10 17:08:22 +09:00
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py treewide: correct several "up-to-date" to "up to date" 2017-08-23 12:17:22 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh Merge branch 'kw/rebase-progress' 2017-08-23 14:13:07 -07:00
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh Merge branch 'kw/rebase-progress' 2017-08-23 14:13:07 -07:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl send-email: don't use Mail::Address, even if available 2017-08-24 14:40:17 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'mf/no-dashed-subcommands' into maint 2017-09-10 17:02:56 +09:00
git-submodule.sh Merge branch 'sb/submodule-parallel-update' into maint 2017-09-10 17:03:06 +09:00
git-svn.perl
git-web--browse.sh
git.c Merge branch 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
git.rc
gpg-interface.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
gpg-interface.h
graph.c
graph.h
grep.c Merge branch 'as/grep-quiet-no-match-exit-code-fix' into maint 2017-09-10 17:02:55 +09:00
grep.h
hash.h sha1dc: build git plumbing code more explicitly 2017-08-16 14:43:59 -07:00
hashmap.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
hashmap.h hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
help.c
help.h
hex.c
http-backend.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
http-fetch.c
http-push.c pack: move find_sha1_pack() 2017-08-23 15:12:07 -07:00
http-walker.c pack: move find_sha1_pack() 2017-08-23 15:12:07 -07:00
http.c Merge branch 'jt/packmigrate' 2017-08-26 22:55:09 -07:00
http.h
ident.c
imap-send.c imap-send: use curl by default when possible 2017-09-15 13:46:19 +09:00
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h tempfile: use list.h for linked list 2017-09-06 17:19:54 +09:00
ll-merge.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
ll-merge.h
lockfile.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
lockfile.h lockfile: update lifetime requirements in documentation 2017-09-06 17:19:54 +09:00
log-tree.c
log-tree.h
mailinfo.c mailinfo: release strbuf on error return in handle_boundary() 2017-09-07 08:49:27 +09:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'kw/merge-recursive-cleanup' 2017-09-19 10:47:56 +09:00
merge-recursive.h merge-recursive: change current file dir string_lists to hashmap 2017-09-08 10:36:16 +09:00
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c hashmap: add API to disable item counting when threaded 2017-09-07 09:42:02 +09:00
notes-cache.c
notes-cache.h
notes-merge.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
notes-merge.h
notes-utils.c
notes-utils.h
notes.c Merge branch 'mh/notes-cleanup' 2017-09-19 10:47:52 +09:00
notes.h
object.c
object.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
pack-bitmap.h
pack-check.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c pack: make packed_git_mru global a value instead of a pointer 2017-09-14 15:05:48 +09:00
packfile.h pack: move for_each_packed_object() 2017-08-23 15:12:07 -07:00
pager.c Merge branch 'ma/parse-maybe-bool' 2017-08-22 10:29:03 -07:00
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
path.h
pathspec.c pathspec doc: parse_pathspec does not maintain references to args 2017-09-21 14:05:00 +09:00
pathspec.h pathspec doc: parse_pathspec does not maintain references to args 2017-09-21 14:05:00 +09:00
pkt-line.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
pkt-line.h
preload-index.c
pretty.c Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
prio-queue.c
prio-queue.h
progress.c progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
progress.h progress: simplify "delayed" progress API 2017-08-19 14:01:34 -07:00
prompt.c
prompt.h
quote.c
quote.h
reachable.c Merge branch 'nd/prune-in-worktree' 2017-09-19 10:47:53 +09:00
reachable.h
read-cache.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
ref-filter.c
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'tg/refs-allowed-flags' 2017-09-25 15:24:07 +09:00
refs.h Merge branch 'tg/refs-allowed-flags' 2017-09-25 15:24:07 +09:00
remote-curl.c
remote-testsvn.c
remote.c Merge branch 'ma/up-to-date' 2017-09-10 17:08:22 +09:00
remote.h
replace_object.c
repository.c set_git_dir: handle feeding gitdir to itself 2017-09-06 18:06:26 +09:00
repository.h
rerere.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c revision: replace "struct cmdline_pathspec" with argv_array 2017-09-21 13:09:46 +09:00
revision.h revision.h: new flag in struct rev_info wrt. worktree-related refs 2017-08-24 14:42:21 -07:00
run-command.c Merge branch 'js/run-process-parallel-api-fix' into maint 2017-08-23 14:33:49 -07:00
run-command.h
send-pack.c send-pack: release strbuf on error return in send_pack() 2017-09-07 08:49:28 +09:00
send-pack.h
sequencer.c sequencer: release strbuf after use in save_head() 2017-09-07 08:49:28 +09:00
sequencer.h
server-info.c pack: move {,re}prepare_packed_git and approximate_object_count 2017-08-23 15:12:07 -07:00
setup.c set_git_dir: handle feeding gitdir to itself 2017-09-06 18:06:26 +09:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h sha1-lookup: remove sha1_entry_pos() from header file 2017-08-25 09:54:26 -07:00
sha1_file.c Merge branch 'jk/info-alternates-fix' 2017-09-25 15:24:09 +09:00
sha1_name.c pack: move open_pack_index(), parse_pack_index() 2017-08-23 15:12:06 -07:00
sha1dc_git.c sha1dc: allow building with the external sha1dc library 2017-08-16 14:44:25 -07:00
sha1dc_git.h sha1dc: allow building with the external sha1dc library 2017-08-16 14:44:25 -07:00
shallow.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
shell.c shell: drop git-cvsserver support by default 2017-09-12 11:05:58 +09:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'rs/strbuf-getwholeline-fix' 2017-08-22 10:29:15 -07:00
strbuf.h Merge branch 'ma/ts-cleanups' 2017-09-10 17:08:22 +09:00
streaming.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
streaming.h
string-list.c
string-list.h for_each_string_list_item: avoid undefined behavior for empty list 2017-09-20 14:41:08 +09:00
sub-process.c Merge branch 'cc/subprocess-handshake-missing-capabilities' 2017-09-25 15:24:06 +09:00
sub-process.h
submodule-config.c Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
submodule-config.h Merge branch 'bw/grep-recurse-submodules' 2017-08-22 10:29:01 -07:00
submodule.c submodule: correct error message for missing commits 2017-09-28 14:15:20 +09:00
submodule.h Merge branch 'bw/submodule-config-cleanup' 2017-08-26 22:55:08 -07:00
symlinks.c
tag.c
tag.h
tar.h
tempfile.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
tempfile.h tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace.c
trace.h
trailer.c tempfile: auto-allocate tempfiles on heap 2017-09-06 17:19:54 +09:00
trailer.h Merge branch 'jk/trailers-parse' 2017-08-26 22:55:04 -07:00
transport-helper.c Merge branch 'jk/write-in-full-fix' 2017-09-25 15:24:06 +09:00
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 Merge branch 'ls/convert-filter-progress' 2017-09-10 17:08:22 +09:00
unpack-trees.h
upload-pack.c
url.c
url.h
urlmatch.c
urlmatch.h
usage.c add UNLEAK annotation for reducing leak false positives 2017-09-08 15:43:17 +09:00
userdiff.c userdiff: release strbuf after use in userdiff_get_textconv() 2017-09-07 08:49:28 +09:00
userdiff.h
utf8.c utf8: release strbuf on error return in strbuf_utf8_replace() 2017-09-07 08:49:28 +09:00
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'nd/prune-in-worktree' 2017-09-19 10:47:53 +09:00
worktree.h revision.c: --all adds HEAD from all worktrees 2017-08-24 14:56:43 -07:00
wrap-for-bin.sh
wrapper.c avoid "write_in_full(fd, buf, len) != len" pattern 2017-09-14 15:17:59 +09:00
write_or_die.c
ws.c
wt-status.c Merge branch 'ks/commit-do-not-touch-cut-line' 2017-09-25 15:24:07 +09:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

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