Go to file
Jeff King 1ab03a57e1 shortlog: skip format/parse roundtrip for internal traversal
The original git-shortlog command parsed the output of
git-log, and the logic went something like this:

  1. Read stdin looking for "author" lines.

  2. Parse the identity into its name/email bits.

  3. Apply mailmap to the name/email.

  4. Reformat the identity into a single buffer that is our
     "key" for grouping entries (either a name by default,
     or "name <email>" if --email was given).

The first part happens in read_from_stdin(), and the other
three steps are part of insert_one_record().

When we do an internal traversal, we just swap out the stdin
read in step 1 for reading the commit objects ourselves.
Prior to 2db6b83d18 (shortlog: replace hand-parsing of
author with pretty-printer, 2016-01-18), that made sense; we
still had to parse the ident in the commit message.

But after that commit, we use pretty.c's "%an <%ae>" to get
the author ident (for simplicity). Which means that the
pretty printer is doing a parse/format under the hood, and
then we parse the result, apply the mailmap, and format the
result again.

Instead, we can just ask pretty.c to do all of those steps
for us (including the mailmap via "%aN <%aE>", and not
formatting the address when --email is missing).

And then we can push steps 2-4 into read_from_stdin(). This
speeds up "git shortlog -ns" on linux.git by about 3%, and
eliminates a leak in insert_one_record() of the namemailbuf
strbuf.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-09-09 01:57:03 +09:00
.github
Documentation Prepare for 2.14.2 2017-08-23 14:36:03 -07:00
block-sha1
builtin shortlog: skip format/parse roundtrip for internal traversal 2017-09-09 01:57:03 +09:00
ci
compat Merge branch 'rs/bswap-ubsan-fix' into maint 2017-08-23 14:33:46 -07:00
contrib add MOVE_ARRAY 2017-07-17 14:54:53 -07:00
ewah use DIV_ROUND_UP 2017-07-10 14:24:36 -07:00
git-gui Merge branch 'js/msgfmt-on-windows' of ../git-gui into js/git-gui-msgfmt-on-windows 2017-07-25 13:42:41 -07:00
gitk-git
gitweb Merge branch 'hb/gitweb-project-list' into maint 2017-08-23 14:33:44 -07:00
mergetools
perl Merge branch 'pw/unquote-path-in-git-pm' 2017-07-10 13:42:50 -07:00
po l10n: zh_CN: review for git v2.14.0 l10n 2017-08-02 08:02:37 +08:00
ppc
refs Merge branch 'mh/packed-ref-store-prep' 2017-06-26 14:09:29 -07:00
sha1collisiondetection@19d97bf5af sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
sha1dc Merge branch 'ab/sha1dc-maint' 2017-07-06 18:14:44 -07:00
t Merge branch 'jt/t1450-fsck-corrupt-packfile' into maint 2017-08-23 14:33:52 -07:00
templates pre-rebase hook: capture documentation in a <<here document 2017-07-11 08:56:33 -07:00
vcs-svn
xdiff
.gitattributes
.gitignore
.gitmodules sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
.mailmap
.travis.yml
COPYING
GIT-VERSION-GEN Prepare for 2.14.2 2017-08-23 14:36:03 -07:00
INSTALL
LGPL-2.1
Makefile git-gui (MinGW): make use of MSys2's msgfmt 2017-07-25 12:32:14 -07:00
README.md
RelNotes Prepare for 2.14.2 2017-08-23 14:36:03 -07:00
abspath.c Spelling fixes 2017-06-27 10:35:49 -07:00
aclocal.m4
advice.c Merge branch 'jk/warn-add-gitlink' 2017-06-24 14:28:41 -07:00
advice.h
alias.c Merge branch 'js/alias-case-sensitivity' 2017-07-20 16:29:59 -07:00
alloc.c
apply.c Merge branch 'rs/apply-avoid-over-reading' into maint 2017-07-31 13:51:04 -07:00
apply.h
archive-tar.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive-zip.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
archive.h
argv-array.c
argv-array.h
attr.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
attr.h
base85.c
bisect.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
bisect.h
blame.c Merge branch 'js/blame-lib' 2017-07-31 13:05:15 -07:00
blame.h
blob.c
blob.h
branch.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
cache-tree.h
cache.h Merge branch 'jt/subprocess-handshake' into maint 2017-08-23 14:33:52 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c color: check color.ui in git_default_config() 2017-07-13 12:42:51 -07:00
color.h
column.c
column.h
combine-diff.c Merge branch 'bw/ls-files-sans-the-index' 2017-06-24 14:28:40 -07:00
command-list.txt
commit-slab.h
commit.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
commit.h
common-main.c
config.c Merge branch 'jk/ref-filter-colors' into maint 2017-08-23 14:33:42 -07:00
config.h config: read config from a repository object 2017-06-23 18:24:34 -07:00
config.mak.in
config.mak.uname config.mak.uname: set FREAD_READS_DIRECTORIES for cygwin 2017-07-21 11:58:06 -07:00
configure.ac Merge branch 'nd/fopen-errors' 2017-06-22 14:15:20 -07:00
connect.c Git 2.13.5 2017-08-04 12:40:37 -07:00
connect.h
connected.c
connected.h
convert.c sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
convert.h Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake 2017-07-26 12:56:19 -07:00
copy.c
credential-cache--daemon.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07: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 Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c Merge branch 'ab/strbuf-addftime-tzname-boolify' 2017-07-06 18:14:47 -07:00
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
diff-no-index.c
diff.c color: check color.ui in git_default_config() 2017-07-13 12:42:51 -07:00
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
diffcore-pickaxe.c
diffcore-rename.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -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 Merge branch 'pc/dir-count-slashes' 2017-06-22 14:15:21 -07:00
editor.c
entry.c convert: add "status=delayed" to filter process protocol 2017-06-30 13:50:41 -07:00
environment.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
fetch-pack.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl Merge branch 'pw/unquote-path-in-git-pm' into maint 2017-07-31 13:51:05 -07:00
git-archimport.perl
git-bisect.sh
git-compat-util.h Merge branch 'rs/move-array' into maint 2017-08-23 14:33:46 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
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: filter for {'code':'info'} in p4CmdList 2017-07-13 10:52:42 -07:00
git-parse-remote.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl Merge branch 'xz/send-email-batch-size' 2017-07-06 18:14:46 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh Merge branch 'lb/status-stash-count' 2017-06-26 14:09:29 -07:00
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
git.rc
gpg-interface.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
gpg-interface.h
graph.c
graph.h
grep.c grep: remove redundant REG_NEWLINE when compiling fixed regex 2017-06-30 10:06:24 -07:00
grep.h grep: remove regflags from the public grep_opt API 2017-06-30 10:06:24 -07:00
hash.h sha1dc: optionally use sha1collisiondetection as a submodule 2017-07-03 10:09:34 -07:00
hashmap.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
hashmap.h hashmap: migrate documentation from Documentation/technical into header 2017-06-30 13:11:59 -07:00
help.c Merge branch 'mb/reword-autocomplete-message' into maint 2017-07-10 13:59:04 -07:00
help.h
hex.c
http-backend.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
http-fetch.c
http-push.c
http-walker.c
http.c Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths' into maint 2017-08-23 14:33:43 -07:00
http.h
ident.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
imap-send.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
iterator.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
list.h
ll-merge.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
log-tree.h
mailinfo.c Spelling fixes 2017-06-27 10:35:49 -07:00
mailinfo.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'sb/merge-recursive-code-cleanup' 2017-07-06 18:14:45 -07:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
mru.c
mru.h
name-hash.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
notes-cache.c
notes-cache.h
notes-merge.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
notes-merge.h
notes-utils.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
notes-utils.h
notes.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
notes.h
object.c object: remove "used" field from struct object 2017-07-20 14:54:08 -07:00
object.h object: remove "used" field from struct object 2017-07-20 14:54:08 -07:00
oidset.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
oidset.h
pack-bitmap-write.c
pack-bitmap.c Merge branch 'jc/pack-bitmap-unaligned' into maint 2017-07-10 13:59:00 -07:00
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
parse-options-cb.c
parse-options.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
parse-options.h
patch-delta.c
patch-ids.c patch-ids.c: use hashmap correctly 2017-06-30 13:11:54 -07:00
patch-ids.h
path.c Git 2.13.5 2017-08-04 12:40:37 -07:00
path.h path: add repo_worktree_path and strbuf_repo_worktree_path 2017-06-23 18:24:34 -07:00
pathspec.c Spelling fixes 2017-06-27 10:35:49 -07:00
pathspec.h
pkt-line.c sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
pkt-line.h sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
preload-index.c
pretty.c pretty: respect color settings for %C placeholders 2017-07-13 12:42:51 -07:00
prio-queue.c
prio-queue.h
progress.c progress: show overall rate in last update 2017-07-09 09:54:20 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
ref-filter.c ref-filter: consult want_color() before emitting colors 2017-07-13 12:42:51 -07:00
ref-filter.h ref-filter: consult want_color() before emitting colors 2017-07-13 12:42:51 -07:00
reflog-walk.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
reflog-walk.h reflog-walk: apply --since/--until to reflog dates 2017-07-09 10:00:48 -07:00
refs.c Merge branch 'cc/ref-is-hidden-microcleanup' into maint 2017-08-23 14:33:50 -07:00
refs.h Spelling fixes 2017-06-27 10:35:49 -07:00
remote-curl.c
remote-testsvn.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
remote.c hashmap.h: compare function has access to a data field 2017-06-30 12:49:28 -07:00
remote.h
replace_object.c
repository.c repository: enable initialization of submodules 2017-06-23 18:24:34 -07:00
repository.h repository: enable initialization of submodules 2017-06-23 18:24:34 -07:00
rerere.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'jk/reflog-walk' into maint 2017-08-23 14:33:44 -07:00
revision.h Merge branch 'sg/revision-parser-skip-prefix' into maint 2017-06-24 15:29:34 -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 Spelling fixes 2017-06-27 10:35:49 -07:00
send-pack.h
sequencer.c Merge branch 'pw/rebase-i-regression-fix-tests' into maint 2017-07-10 13:59:00 -07:00
sequencer.h
server-info.c
setup.c Merge branch 'js/alias-early-config' into maint 2017-07-10 13:58:58 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'ew/fd-cloexec-fix' into maint 2017-07-21 15:03:40 -07:00
sha1_name.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
sha1dc_git.c
sha1dc_git.h
shallow.c Merge branch 'rs/use-div-round-up' 2017-07-12 15:18:23 -07:00
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
split-index.h Revert "split-index: add and use unshare_split_index()" 2017-06-24 12:02:39 -07:00
strbuf.c Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
strbuf.h Merge branch 'rs/pretty-add-again' into maint 2017-07-10 13:58:57 -07:00
streaming.c
streaming.h
string-list.c use MOVE_ARRAY 2017-07-17 14:54:56 -07:00
string-list.h
sub-process.c sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
sub-process.h sub-process: refactor handshake to common function 2017-07-26 13:00:40 -07:00
submodule-config.c Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule-config.h Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule.c Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
submodule.h Merge branch 'sb/pull-rebase-submodule' 2017-07-13 16:14:54 -07:00
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.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
transport.h
tree-diff.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
tree-walk.c Merge branch 'jk/diff-blob' into maint 2017-06-24 15:29:28 -07:00
tree-walk.h
tree.c Merge branch 'ab/free-and-null' 2017-06-24 14:28:41 -07:00
tree.h
unicode_width.h unicode: update the width tables to Unicode 10 2017-07-07 10:33:30 -07:00
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake 2017-07-26 12:56:19 -07:00
unpack-trees.h
upload-pack.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
url.c
url.h
urlmatch.c urlmatch: use hex2chr() in append_normalized_escapes() 2017-07-09 09:43:01 -07:00
urlmatch.h
usage.c die(): stop hiding errors due to overzealous recursion guard 2017-06-21 14:09:13 -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: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
wildmatch.h wildmatch: remove unused wildopts parameter 2017-06-23 18:27:07 -07:00
worktree.c path: convert strbuf_git_common_path to take a 'struct repository' 2017-06-23 18:24:34 -07:00
worktree.h
wrap-for-bin.sh
wrapper.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
write_or_die.c
ws.c
wt-status.c Merge branch 'rs/wt-status-cleanup' 2017-07-12 15:18:23 -07:00
wt-status.h Merge branch 'ks/status-initial-commit' 2017-06-30 13:45:22 -07:00
xdiff-interface.c Merge branch 'bw/config-h' 2017-06-24 14:28:41 -07:00
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