Go to file
Jeff King 5d5def2aa5 get_short_sha1: parse tags when looking for treeish
The treeish disambiguation function tries to peel tags, but
it does so by calling:

  deref_tag(lookup_object(sha1), ...);

This will only work if we have previously looked at the tag
and created a "struct tag" for it. Since parsing revision
arguments typically happens before anything else, this is
usually not the case, and we would fail to peel the tag (we
are lucky that deref_tag() gracefully handles the NULL and
does not segfault).

Instead, we can use parse_object(). Note that this is the
same fix done by 94d75d1 (get_short_sha1(): correctly
disambiguate type-limited abbreviation, 2013-07-01), but
that commit fixed only the committish disambiguator, and
left the bug in the treeish one.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-09-26 11:46:30 -07:00
Documentation Fourth batch for 2.11 2016-09-21 15:20:44 -07:00
block-sha1
builtin Merge branch 'jk/reduce-gc-aggressive-depth' 2016-09-21 15:15:30 -07:00
ci
compat Merge branch 'rs/compat-strdup' into maint 2016-09-19 13:51:42 -07:00
contrib Merge branch 'js/import-tars-hardlinks' into maint 2016-09-08 21:35:54 -07:00
ewah
git-gui Merge branch 'js/git-gui-commit-gpgsign' 2016-09-15 14:11:16 -07:00
gitk-git
gitweb gitweb: escape link body in format_ref_marker 2016-08-01 12:55:40 -07:00
mergetools
perl
po l10n: zh_CN: review for git v2.10.0 l10n 2016-09-11 21:34:23 +08:00
ppc
refs Merge branch 'mh/ref-store' 2016-09-19 13:47:19 -07:00
t get_short_sha1: parse tags when looking for treeish 2016-09-26 11:46:30 -07:00
templates
vcs-svn Merge branch 'mr/vcs-svn-printf-ulong' 2016-09-21 15:15:27 -07:00
xdiff Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context' 2016-09-21 15:15:26 -07:00
.gitattributes
.gitignore
.mailmap .mailmap: use Christian Couder's Tuxfamily address 2016-08-08 15:17:24 -07:00
.travis.yml Merge branch 'ls/travis-enable-httpd-tests' into maint 2016-08-10 11:55:23 -07:00
COPYING
GIT-VERSION-GEN Start the 2.11 cycle 2016-09-08 22:00:35 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'rs/compat-strdup' into maint 2016-09-19 13:51:42 -07:00
README.md
RelNotes Start preparing for 2.10.1 2016-09-19 13:54:50 -07:00
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
apply.c Merge branch 'bc/object-id' 2016-09-19 13:47:19 -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 i18n: archive: mark errors for translation 2016-08-09 12:44:59 -07:00
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 get_sha1: detect buggy calls with multiple disambiguators 2016-09-26 11:21:28 -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/pull-signed-tag' 2016-08-19 15:34:14 -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 Merge branch 'ew/build-time-pager-tweaks' 2016-08-08 14:48:44 -07:00
configure.ac Merge branch 'ew/autoconf-pthread' into maint 2016-08-10 11:55:21 -07:00
connect.c Merge branch 'jt/accept-capability-advertisement-when-fetching-from-void' 2016-09-21 15:15: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
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 'bc/object-id' 2016-09-19 13:47:19 -07:00
diff.h Merge branch 'jk/diff-submodule-diff-inline' 2016-09-12 15:34:31 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c pass constants as first argument to st_mult() 2016-08-01 14:01:03 -07:00
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.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'rs/compat-strdup' into maint 2016-09-19 13:51:42 -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 'jk/rebase-i-drop-ident-check' 2016-09-21 15:15:28 -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 Merge branch 'ew/build-time-pager-tweaks' 2016-08-08 14:48:44 -07:00
git-stash.sh i18n: git-stash: mark messages for translation 2016-08-10 10:50:18 -07:00
git-submodule.sh Merge branch 'sb/submodule-clone-rr' 2016-09-08 21:49:50 -07:00
git-svn.perl
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/am-3-merge-recursive-direct' 2016-08-10 12:33:20 -07:00
grep.h Merge branch 'jc/grep-commandline-vs-configuration' into maint 2016-08-10 11:55:29 -07:00
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' 2016-09-21 15:15:23 -07:00
http.h
ident.c Merge branch 'jk/reset-ident-time-per-commit' into maint 2016-08-12 09:16:56 -07:00
imap-send.c
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
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 'rs/mailinfo-lib' into maint 2016-09-08 21:36:01 -07:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'rs/merge-recursive-string-list-init' into maint 2016-09-08 21:35:59 -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 Convert read_mmblob to take struct object_id. 2016-09-07 12:59:42 -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
pack-objects.c
pack-objects.h
pack-revindex.c
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 'jk/parse-options-concat' 2016-08-03 15:10:25 -07:00
parse-options.c
parse-options.h
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
pathspec.h Merge branch 'bw/pathspec-remove-unused-extern-decl' 2016-09-21 15:15:22 -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/hex2chr' into maint 2016-09-19 13:51:43 -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 'jc/renormalize-merge-kill-safer-crlf' into maint 2016-09-08 21:35:52 -07:00
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
remote-curl.c
remote-testsvn.c
remote.c Merge branch 'jk/push-force-with-lease-creation' into maint 2016-09-08 21:35:53 -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 Merge branch 'rs/use-strbuf-addstr' into maint 2016-08-10 11:55:34 -07:00
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 i18n: setup: mark error messages for translation 2016-08-09 12:44:59 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'rs/pack-sort-with-llist-mergesort' 2016-09-21 15:15:25 -07:00
sha1_name.c get_short_sha1: parse tags when looking for treeish 2016-09-26 11:46:30 -07:00
shallow.c pass constants as first argument to st_mult() 2016-08-01 14:01:03 -07:00
shell.c
shortlog.h
show-index.c
sideband.c Merge branch 'lf/recv-sideband-cleanup' into maint 2016-08-08 14:21:41 -07:00
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c Merge branch 'rs/strbuf-remove-fix' 2016-09-21 15:15:25 -07:00
strbuf.h Merge branch 'rs/use-strbuf-addbuf' into maint 2016-08-08 14:21:42 -07:00
streaming.c streaming: make stream_blob_to_fd take struct object_id 2016-09-07 12:59:42 -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 Merge branch 'sb/submodule-update-dot-branch' 2016-08-10 12:33:20 -07:00
submodule-config.h submodule-config: keep configured branch around 2016-08-01 14:42:07 -07:00
submodule.c Merge branch 'jc/submodule-anchor-git-dir' into maint 2016-09-19 13:51:40 -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: do not fall back to stderr 2016-08-05 09:28:17 -07:00
trace.h
trailer.c
trailer.h
transport-helper.c Spelling fixes 2016-08-11 14:35:42 -07:00
transport.c Merge branch 'rs/use-strbuf-add-unique-abbrev' into maint 2016-09-08 21:36:00 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
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' 2016-09-21 15:15:26 -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 write_or_die: drop write_or_whine_pipe() 2016-08-05 09:28:17 -07:00
ws.c
wt-status.c Merge branch 'bc/object-id' 2016-09-19 13:47:19 -07:00
wt-status.h status: print branch info with --porcelain=v2 --branch 2016-08-11 11:15:40 -07:00
xdiff-interface.c Convert read_mmblob to take struct object_id. 2016-09-07 12:59:42 -07:00
xdiff-interface.h Convert read_mmblob to take struct object_id. 2016-09-07 12:59:42 -07:00
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 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