Go to file
Carlo Marcelo Arenas Belón 57d4660468 grep: make PCRE1 aware of custom allocator
63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09) didn't include a way
to override the system alocator, and so it is incompatible with
USE_NED_ALLOCATOR as reported by Dscho[1] (in similar code from PCRE2)

Note that nedmalloc, as well as other custom allocators like jemalloc
and mi-malloc, can be configured at runtime (via `LD_PRELOAD`),
therefore we cannot know at compile time whether a custom allocator is
used or not.

Make the minimum change possible to ensure this combination is supported
by extending `grep_init()` to set the PCRE1 specific functions to Git's
idea of `malloc()` and `free()` and therefore making sure all
allocations are done inside PCRE1 with the same allocator than the rest
of Git.

This change has negligible performance impact: PCRE needs to allocate
memory once per program run for the character table and for each pattern
compilation. These are both rare events compared to matching patterns
against lines. Actual measurements[2] show that the impact is lost in
the noise.

[1] https://public-inbox.org/git/pull.306.git.gitgitgadget@gmail.com
[2] https://public-inbox.org/git/7f42007f-911b-c570-17f6-1c6af0429586@web.de

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-10-18 10:33:16 +09:00
.github
Documentation RelNotes/2.23.0: fix a few typos and other minor issues 2019-08-01 09:01:35 -07:00
block-sha1
builtin Merge branch 'jk/repack-silence-auto-bitmap-warning' 2019-08-01 09:10:50 -07:00
ci Merge branch 'sg/travis-gcc-4.8' 2019-07-29 12:39:13 -07:00
compat Merge branch 'js/mingw-spawn-with-spaces-in-path' into maint 2019-07-29 12:38:17 -07:00
contrib Merge branch 'nd/completion-no-cache-failure' into maint 2019-07-29 12:38:20 -07:00
ewah
git-gui
gitk-git
gitweb
mergetools
negotiator
perl
po
ppc
refs dir-iterator: add flags parameter to dir_iterator_begin 2019-07-11 13:52:15 -07:00
sha1collisiondetection@855827c583
sha1dc
sha256
t Merge branch 'jk/repack-silence-auto-bitmap-warning' 2019-08-01 09:10:50 -07:00
templates
trace2
vcs-svn
xdiff Merge branch 'cb/xdiff-no-system-includes-in-dot-c' 2019-07-31 14:38:56 -07:00
.clang-format
.editorconfig
.gitattributes
.gitignore Merge branch 'ab/test-env' 2019-07-25 13:59:20 -07:00
.gitmodules
.mailmap
.travis.yml travis-ci: build with GCC 4.8 as well 2019-07-19 14:06:01 -07:00
.tsan-suppressions
COPYING
GIT-VERSION-GEN Git 2.23-rc0 2019-07-29 12:51:24 -07:00
INSTALL
LGPL-2.1
Makefile Merge branch 'mt/dir-iterator-updates' 2019-07-25 13:59:22 -07:00
README.md README: fix rendering of text in angle brackets 2019-07-18 14:47:46 -07:00
RelNotes Flush fixes up to the third batch post 2.22.0 2019-07-25 14:32:36 -07:00
abspath.c
aclocal.m4
advice.c Merge branch 'ra/cherry-pick-revert-skip' 2019-07-19 11:30:21 -07:00
advice.h Merge branch 'ra/cherry-pick-revert-skip' 2019-07-19 11:30:21 -07:00
alias.c
alias.h
alloc.c
alloc.h
apply.c apply: make parse_git_diff_header public 2019-07-11 14:29:27 -07:00
apply.h apply: make parse_git_diff_header public 2019-07-11 14:29:27 -07:00
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 Merge branch 'nd/tree-walk-with-repo' 2019-07-19 11:30:21 -07:00
blame.h Merge branch 'br/blame-ignore' 2019-07-19 11:30:20 -07:00
blob.c
blob.h
branch.c Merge branch 'nd/switch-and-restore' 2019-07-09 15:25:44 -07:00
branch.h Merge branch 'nd/switch-and-restore' 2019-07-09 15:25:44 -07:00
builtin.h Merge branch 'ab/test-env' 2019-07-25 13:59:20 -07:00
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'sg/rebase-progress' into maint 2019-07-29 12:38:19 -07:00
chdir-notify.c
chdir-notify.h
check-builtins.sh
check_bindir
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-graph.c Merge branch 'ds/close-object-store' into maint 2019-07-29 12:38:22 -07:00
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c Merge branch 'ds/close-object-store' into maint 2019-07-29 12:38:22 -07:00
commit.h
common-main.c
config.c Merge branch 'ab/test-env' 2019-07-25 13:59:20 -07:00
config.h
config.mak.dev
config.mak.in
config.mak.uname Merge branch 'js/mingw-gcc-stack-protect' 2019-07-11 15:16:47 -07: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 Merge branch 'jk/oidhash' 2019-07-09 15:25:43 -07:00
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'js/unmap-before-ext-diff' into maint 2019-07-29 12:38:11 -07:00
diff.h range-diff: suppress line count in outer diff 2019-07-11 14:29:27 -07:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Merge branch 'jk/oidhash' 2019-07-09 15:25:43 -07:00
diffcore.h
dir-iterator.c dir-iterator: add flags parameter to dir_iterator_begin 2019-07-11 13:52:15 -07:00
dir-iterator.h dir-iterator: add flags parameter to dir_iterator_begin 2019-07-11 13:52:15 -07:00
dir.c
dir.h
editor.c
entry.c
environment.c
exec-cmd.c
exec-cmd.h
fast-import.c Merge branch 'nd/tree-walk-with-repo' 2019-07-19 11:30:21 -07:00
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c Merge branch 'nd/fetch-capability-tweak' 2019-07-09 15:25:43 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c Merge branch 'br/blame-ignore' 2019-07-19 11:30:20 -07:00
fsck.h
fsmonitor.c Merge branch 'cb/fsmonitor-intfix' into maint 2019-07-29 12:38:15 -07:00
fsmonitor.h
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c Merge branch 'ab/test-env' 2019-07-25 13:59:20 -07:00
gettext.h
git-add--interactive.perl Merge branch 'pw/add-p-recount' into maint 2019-07-29 12:38:22 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-stash.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py Merge branch 'sw/git-p4-unshelve-branched-files' into maint 2019-07-25 14:27:15 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--preserve-merges.sh
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 Merge branch 'js/rebase-cleanup' 2019-07-29 12:39:14 -07:00
git.rc
gpg-interface.c gpg-interface: do not scan past the end of buffer 2019-07-16 12:15:12 -07:00
gpg-interface.h
graph.c
graph.h
grep.c grep: make PCRE1 aware of custom allocator 2019-10-18 10:33:16 +09:00
grep.h
hash.h
hashmap.c
hashmap.h
help.c
help.h
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 Merge branch 'rs/copy-array' into maint 2019-07-29 12:38:15 -07:00
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 Merge branch 'md/list-objects-filter-memfix' into maint 2019-07-25 14:27:12 -07:00
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 'ds/object-info-for-prefetch-fix' into maint 2019-07-25 14:27:08 -07:00
object.c Merge branch 'jk/oidhash' 2019-07-09 15:25:43 -07:00
object.h
oidmap.c Merge branch 'cc/test-oidmap' 2019-07-19 11:30:19 -07:00
oidmap.h
oidset.c Merge branch 'br/blame-ignore' 2019-07-19 11:30:20 -07:00
oidset.h Merge branch 'br/blame-ignore' 2019-07-19 11:30:20 -07:00
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 Merge branch 'ds/close-object-store' into maint 2019-07-29 12:38:22 -07:00
packfile.h Merge branch 'ds/close-object-store' into maint 2019-07-29 12:38:22 -07:00
pager.c
parse-options-cb.c Merge branch 'nd/switch-and-restore' 2019-07-09 15:25:44 -07:00
parse-options.c
parse-options.h Merge branch 'nd/switch-and-restore' 2019-07-09 15:25:44 -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 'dr/progress-i18n' 2019-07-11 15:16:49 -07:00
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c range-diff: add headers to the outer hunk header 2019-07-11 14:29:27 -07:00
range-diff.h
reachable.c
reachable.h
read-cache.c Merge branch 'rs/avoid-overflow-in-midpoint-computation' into maint 2019-07-29 12:38:21 -07:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c Merge branch 'ma/ref-filter-leakfix' 2019-07-19 11:30:23 -07:00
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 Merge branch 'jk/check-connected-with-alternates' 2019-07-19 11:30:21 -07:00
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'pw/rebase-abort-clean-rewritten' into maint 2019-07-29 12:38:20 -07:00
sequencer.h Merge branch 'ra/cherry-pick-revert-skip' 2019-07-19 11:30:21 -07: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 'ds/object-info-for-prefetch-fix' into maint 2019-07-25 14:27:08 -07:00
sha1-lookup.c
sha1-lookup.h
sha1-name.c Merge branch 'nd/tree-walk-with-repo' 2019-07-19 11:30:21 -07: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
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
trace2.c
trace2.h
trailer.c
trailer.h
transport-helper.c Merge branch 'es/local-atomic-push-failure-with-http' into maint 2019-07-29 12:38:16 -07:00
transport-internal.h
transport.c Merge branch 'es/local-atomic-push-failure-with-http' 2019-07-25 13:59:22 -07:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h Merge branch 'bb/unicode-12.1-reiwa' into maint 2019-07-25 14:27:11 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'nd/tree-walk-with-repo' 2019-07-19 11:30:21 -07:00
unpack-trees.h
upload-pack.c Merge branch 'ds/close-object-store' into maint 2019-07-29 12:38:22 -07:00
upload-pack.h
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.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c Merge branch 'nd/corrupt-worktrees' into maint 2019-07-25 14:27:07 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c Merge branch 'jl/status-reduce-vertical-blank' 2019-07-19 11:30:23 -07:00
wt-status.h Merge branch 'jk/no-system-includes-in-dot-c' 2019-07-31 14:38:56 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

Build Status

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://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