mirror/ git

mirror of https://github.com/git/git.git synced 2024-05-28 06:56:10 +02:00

Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.

c shell

Go to file

Jeff King 8ed51b0666 help_unknown_ref(): duplicate collected refnames When "git merge" sees an unknown refname, we iterate through the refs to try to suggest some possible alternates. We do so with for_each_ref(), and in the callback we add some of the refnames we get to a string_list that is declared with NODUP, directly adding a pointer into the refname string our callback received. But the for_each_ref() machinery does not promise that the refname string will remain valid, and as a result we may print garbage memory. The code in question dates back to its inception in `e56181060e` (help: add help_unknown_ref(), 2013-05-04). But back then, the refname strings generally did remain stable, at least immediately after the for_each_ref() call. Later, in `d1cf15516f` (packed_ref_iterator_begin(): iterate using `mmapped_ref_iterator`, 2017-09-25), we started consistently re-using a separate buffer for packed refs. The fix is simple: duplicate the strings we intend to collect. We already call string_list_clear(), so the memory is correctly freed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2019-05-15 10:58:00 +09:00
.github	…
Documentation	Merge branch 'yn/checkout-doc-fix'	2019-02-24 07:18:00 -08:00
block-sha1	…
builtin	Fix typos in translatable strings for v2.21.0	2019-02-11 12:58:06 -08:00
ci	ci: clear and mark MAKEFLAGS exported just once	2019-02-07 11:36:28 -08:00
compat	mingw: safe-guard a bit more against getenv() problems	2019-02-15 10:25:28 -08:00
contrib	…
ewah	…
git-gui	…
gitk-git	…
gitweb	…
mergetools	…
negotiator	…
perl	…
po	l10n: Fixes to Catalan translation	2019-03-02 19:12:58 +01:00
ppc	…
refs	…
sha1collisiondetection@232357eb2e	…
sha1dc	…
sha256	…
t	help_unknown_ref(): duplicate collected refnames	2019-05-15 10:58:00 +09:00
templates	…
vcs-svn	…
xdiff	…
.clang-format	…
.editorconfig	…
.gitattributes	…
.gitignore	…
.gitmodules	…
.mailmap	.mailmap: map Clemens Buchacher's mail addresses	2019-02-08 11:14:15 -08:00
.travis.yml	…
.tsan-suppressions	…
COPYING	…
GIT-VERSION-GEN	Git 2.21	2019-02-24 07:55:19 -08:00
INSTALL	…
LGPL-2.1	…
Makefile	tests: teach the test-tool to generate NUL bytes and use it	2019-02-19 10:22:21 -08:00
README.md	README: adjust for final Azure Pipeline ID	2019-02-23 21:27:04 -08:00
RelNotes	…
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alias.h	…
alloc.c	…
alloc.h	…
apply.c	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
apply.h	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	…
attr.h	…
azure-pipelines.yml	…
banned.h	…
base85.c	…
bisect.c	…
bisect.h	…
blame.c	…
blame.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	…
bundle.h	…
cache-tree.c	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
cache-tree.h	…
cache.h	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
chdir-notify.c	…
chdir-notify.h	…
check-builtins.sh	…
check-racy.c	…
check_bindir	…
checkout.c	…
checkout.h	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit-graph.c	…
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	mingw: allow building with an MSYS2 runtime v3.x	2019-03-11 11:02:16 +09:00
configure.ac	…
connect.c	…
connect.h	…
connected.c	…
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-no-index.c	…
diff.c	…
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	…
dir.h	…
editor.c	…
entry.c	…
environment.c	…
exec-cmd.c	…
exec-cmd.h	…
fast-import.c	…
fetch-negotiator.c	…
fetch-negotiator.h	…
fetch-object.c	…
fetch-object.h	…
fetch-pack.c	Merge branch 'bc/fetch-pack-clear-alternate-shallow'	2019-02-06 22:05:30 -08:00
fetch-pack.h	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
fsmonitor.c	…
fsmonitor.h	…
fuzz-commit-graph.c	fuzz-commit-graph: initialize repo object	2019-02-07 13:02:26 -08:00
fuzz-pack-headers.c	…
fuzz-pack-idx.c	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'nd/fileno-may-be-macro'	2019-02-13 18:18:41 -08:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	…
git-difftool--helper.sh	…
git-filter-branch.sh	…
git-instaweb.sh	…
git-legacy-rebase.sh	Merge branch 'js/rebase-i-redo-exec-fix'	2019-02-08 20:44:52 -08:00
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--am.sh	…
git-rebase--common.sh	…
git-rebase--preserve-merges.sh	…
git-remote-testgit.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	Merge branch 'sh/submodule-summary-abbrev-fix'	2019-02-06 22:05:27 -08:00
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_unknown_ref(): duplicate collected refnames	2019-05-15 10:58:00 +09:00
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
http-walker.c	…
http.c	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
http.h	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
ident.c	…
imap-send.c	Merge branch 'nd/imap-send-typofix'	2019-02-12 09:00:25 -08:00
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	…
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-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
midx.c	…
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	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
object.c	object: fix leak of shallow_stat	2019-02-07 13:02:28 -08:00
object.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	…
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	…
progress.h	…
prompt.c	…
prompt.h	…
protocol.c	…
protocol.h	…
quote.c	…
quote.h	…
range-diff.c	…
range-diff.h	…
reachable.c	…
reachable.h	…
read-cache.c	Merge branch 'jk/add-ignore-errors-bit-assignment-fix'	2019-02-06 22:05:31 -08:00
rebase-interactive.c	…
rebase-interactive.h	…
ref-filter.c	…
ref-filter.h	…
reflog-walk.c	…
reflog-walk.h	…
refs.c	…
refs.h	…
refspec.c	…
refspec.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	…
remote.h	…
replace-object.c	…
replace-object.h	…
repository.c	…
repository.h	…
rerere.c	…
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	…
revision.h	…
run-command.c	…
run-command.h	…
send-pack.c	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
send-pack.h	…
sequencer.c	Merge branch 'rj/sequencer-sign-off-header-static'	2019-02-13 18:18:41 -08:00
sequencer.h	Merge branch 'rj/sequencer-sign-off-header-static'	2019-02-13 18:18:41 -08:00
serve.c	…
serve.h	…
server-info.c	…
setup.c	…
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-file.c	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
sha1-lookup.c	…
sha1-lookup.h	…
sha1-name.c	get_oid_with_context(): match prototype and implementation	2019-02-12 10:14:56 -08:00
sha1dc_git.c	…
sha1dc_git.h	…
shallow.c	…
shell.c	…
shortlog.h	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
split-index.c	…
split-index.h	…
strbuf.c	…
strbuf.h	…
streaming.c	Merge branch 'jk/loose-object-cache-oid'	2019-02-06 22:05:27 -08:00
streaming.h	…
string-list.c	…
string-list.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	…
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	…
upload-pack.h	…
url.c	…
url.h	…
urlmatch.c	…
urlmatch.h	…
usage.c	…
userdiff.c	…
userdiff.h	…
utf8.c	utf8: handle systems that don't write BOM for UTF-16	2019-02-11 18:20:07 -08:00
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	…
ws.c	…
wt-status.c	…
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.

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