1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-09 02:33:11 +01:00
Find a file
Nguyễn Thái Ngọc Duy e721c1544f checkout: avoid unnecessary match_pathspec calls
In checkout_paths() we do this

 - for all updated items, call match_pathspec
 - for all items, call match_pathspec (inside unmerge_cache)
 - for all items, call match_pathspec (for showing "path .. is unmerged)
 - for updated items, call match_pathspec and update paths

That's a lot of duplicate match_pathspec(s) and the function is not
exactly cheap to be called so many times, especially on large indexes.
This patch makes it call match_pathspec once per updated index entry,
save the result in ce_flags and reuse the results in the following
loops.

The changes in 0a1283b (checkout $tree $path: do not clobber local
changes in $path not in $tree - 2011-09-30) limit the affected paths
to ones we read from $tree. We do not do anything to other modified
entries in this case, so the "for all items" above could be modified
to "for all updated items". But..

The command's behavior now is modified slightly: unmerged entries that
match $path, but not updated by $tree, are now NOT touched.  Although
this should be considered a bug fix, not a regression. A new test is
added for this change.

And while at there, free ps_matched after use.

The following command is tested on webkit, 215k entries. The pattern
is chosen mainly to make match_pathspec sweat:

git checkout -- "*[a-zA-Z]*[a-zA-Z]*[a-zA-Z]*"

        before      after
real    0m3.493s    0m2.737s
user    0m2.239s    0m1.586s
sys     0m1.252s    0m1.151s

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-27 08:53:15 -07:00
block-sha1
builtin checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
compat Merge branch 'rj/msvc-build' 2013-03-19 12:20:40 -07:00
contrib Merge branch 'tz/credential-authinfo' 2013-03-21 14:03:00 -07:00
Documentation Update draft release notes to 1.8.3 2013-03-21 15:29:42 -07:00
git-gui
git_remote_helpers git_remote_helpers: remove GIT-PYTHON-VERSION upon "clean" 2013-01-30 12:34:55 -08:00
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-01-30 13:52:44 -08:00
gitweb gitweb/README: remove reference to git.kernel.org 2013-03-07 11:38:33 -08:00
mergetools Merge branch 'da/p4merge-mktemp-fix' 2013-02-14 16:05:56 -08:00
perl Merge branch 'mn/send-email-works-with-credential' 2013-03-21 14:03:02 -07:00
po l10n: zh_CN.po: translate 1 new message 2013-03-07 08:46:19 +08:00
ppc
t checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
templates templates/hooks--update.sample: use a lowercase "usage:" string 2013-02-24 13:31:09 -08:00
vcs-svn
xdiff
.gitattributes
.gitignore gitk: Ignore gitk-wish buildproduct 2013-01-30 21:12:16 +11:00
.mailmap
abspath.c
aclocal.m4
advice.c Merge branch 'tb/document-status-u-tradeoff' 2013-03-21 14:02:10 -07:00
advice.h Merge branch 'tb/document-status-u-tradeoff' 2013-03-21 14:02:10 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c archive-zip: fix compressed size for stored export-subst files 2013-02-27 07:38:32 -08:00
archive.c
archive.h
argv-array.c
argv-array.h
attr.c Sync with 1.8.1.5 2013-03-01 13:17:18 -08:00
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c bundle: Add colons to list headings in "verify" 2013-03-08 10:06:53 -08:00
bundle.h
cache-tree.c
cache-tree.h
cache.h checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'jk/diff-graph-cleanup' 2013-02-14 10:29:59 -08:00
command-list.txt
commit.c
commit.h Merge branch 'jk/read-commit-buffer-data-after-free' 2013-02-04 10:25:18 -08:00
config.c Merge branch 'jk/config-parsing-cleanup' 2013-02-04 10:24:50 -08:00
config.mak.in Merge branch 'ct/autoconf-htmldir' 2013-02-25 08:27:04 -08:00
config.mak.uname Merge branch 'rj/msvc-build' 2013-03-19 12:20:40 -07:00
configure.ac Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
connect.c
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
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 'dm/ni-maxhost-may-be-missing' 2013-03-19 12:18:21 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c diff.c: diff.renamelimit => diff.renameLimit in message 2013-03-21 14:06:49 -07:00
diff.h Merge branch 'mp/diff-algo-config' 2013-02-17 15:25:52 -08:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c Preallocate hash tables when the number of inserts are known in advance 2013-03-16 22:57:29 -07:00
diffcore.h
dir.c Merge branch 'ap/status-ignored-in-ignored-directory' into maint 2013-01-28 11:10:25 -08:00
dir.h
editor.c
entry.c
environment.c Merge branch 'jc/custom-comment-char' 2013-02-04 10:23:49 -08:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: clarify "inline" logic in file_change_m 2013-03-21 14:06:49 -07:00
fetch-pack.c Merge branch 'jc/fetch-raw-sha1' 2013-03-21 14:02:27 -07:00
fetch-pack.h fetch: use struct ref to represent refs to be fetched 2013-02-07 13:53:59 -08:00
fixup-builtins
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh Merge branch 'jc/fake-ancestor-with-non-blobs' into maint 2013-02-07 15:14:22 -08:00
git-archimport.perl git-archimport: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-bisect.sh
git-compat-util.h Merge branch 'rj/msvc-build' 2013-03-19 12:20:40 -07:00
git-cvsexportcommit.perl git-cvsexportcommit: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsimport.perl git-cvsimport: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-cvsserver.perl git-cvsimport: use a lowercase "usage:" string 2013-02-24 13:31:07 -08:00
git-difftool--helper.sh difftool--helper: fix printf usage 2013-02-10 11:35:50 -08:00
git-difftool.perl difftool: silence uninitialized variable warning 2013-02-17 14:34:38 -08:00
git-filter-branch.sh
git-instaweb.sh
git-lost-found.sh
git-merge-octopus.sh
git-merge-one-file.sh git-merge-one-file: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-merge-resolve.sh
git-mergetool--lib.sh doc: generate a list of valid merge tools 2013-02-02 21:46:52 -08:00
git-mergetool.sh Merge branch 'al/mergetool-printf-fix' 2013-02-14 10:29:37 -08:00
git-p4.py Merge branch 'pw/git-p4-on-cygwin' 2013-02-04 10:25:30 -08:00
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh Merge branch 'jk/rebase-i-comment-char' 2013-02-17 15:25:20 -08:00
git-rebase--merge.sh
git-rebase.sh
git-relink.perl git-relink: use a lowercase "usage:" string 2013-02-24 13:31:06 -08:00
git-remote-testgit
git-remote-testpy.py git-remote-testpy: fix path hashing on Python 3 2013-01-28 09:55:14 -08:00
git-repack.sh
git-request-pull.sh
git-send-email.perl git-send-email: use git credential to obtain password 2013-02-27 09:46:03 -08:00
git-sh-i18n.sh
git-sh-setup.sh git-sh-setup: use a lowercase "usage:" string 2013-02-24 13:31:05 -08:00
git-stash.sh
git-submodule.sh Merge branch 'we/submodule-update-prefix-output' 2013-03-21 14:03:10 -07:00
git-svn.perl git-svn: use a lowercase "usage:" string 2013-02-24 21:30:03 -08:00
GIT-VERSION-GEN Start the post 1.8.2 cycle 2013-03-18 15:01:19 -07:00
git-web--browse.sh
git.c Merge branch 'maint' 2013-03-11 13:00:16 -07:00
git.spec.in
gpg-interface.c Merge branch 'mg/gpg-interface-using-status' 2013-03-21 14:02:55 -07:00
gpg-interface.h gpg_interface: allow to request status return 2013-02-14 09:30:04 -08:00
graph.c Revert "graph.c: mark private file-scope symbols as static" 2013-03-03 19:43:54 -08:00
graph.h Revert "graph.c: mark private file-scope symbols as static" 2013-03-03 19:43:54 -08:00
grep.c
grep.h
hash.c
hash.h Preallocate hash tables when the number of inserts are known in advance 2013-03-16 22:57:29 -07:00
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c Allow building with xmlparse.h 2013-02-11 14:33:04 -08:00
http-walker.c
http.c http_request: reset "type" strbuf before adding 2013-02-06 07:50:56 -08:00
http.h Verify Content-Type from smart HTTP servers 2013-02-04 10:22:36 -08:00
ident.c Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint 2013-02-04 10:04:26 -08:00
imap-send.c Merge branch 'ob/imap-send-ssl-verify' 2013-03-21 14:02:40 -07:00
INSTALL INSTALL: git-p4 does not support Python 3 2013-01-30 11:17:59 -08:00
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c Merge branch 'mg/gpg-interface-using-status' 2013-03-21 14:02:55 -07:00
log-tree.h
mailmap.c
mailmap.h
Makefile Merge branch 'maint' 2013-03-17 00:11:11 -07:00
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c Merge branch 'nd/preallocate-hash' 2013-03-21 14:02:19 -07:00
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes.c
notes.h
object.c
object.h
pack-check.c
pack-refs.c
pack-refs.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c Merge branch 'ef/non-ascii-parse-options-error-diag' into maint 2013-02-27 10:04:26 -08:00
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'mg/gpg-interface-using-status' 2013-03-21 14:02:55 -07:00
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'nd/doc-index-format' 2013-03-19 12:15:14 -07:00
README Merge branch 'ta/doc-no-small-caps' 2013-02-05 16:13:32 -08:00
reflog-walk.c
reflog-walk.h
refs.c Merge branch 'jc/hidden-refs' 2013-02-17 15:25:57 -08:00
refs.h upload/receive-pack: allow hiding ref hierarchies 2013-02-07 13:48:47 -08:00
RelNotes Start the post 1.8.2 cycle 2013-03-18 15:01:19 -07:00
remote-curl.c Verify Content-Type from smart HTTP servers 2013-02-04 10:22:36 -08:00
remote-testsvn.c
remote.c Merge branch 'jc/fetch-raw-sha1' 2013-03-21 14:02:27 -07:00
remote.h fetch: fetch objects by their exact SHA-1 object names 2013-02-07 14:07:53 -08:00
replace_object.c
rerere.c
rerere.h
resolve-undo.c checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
resolve-undo.h checkout: avoid unnecessary match_pathspec calls 2013-03-27 08:53:15 -07:00
revision.c log: re-encode commit messages before grepping 2013-02-11 13:11:45 -08:00
revision.h
run-command.c run-command: always set failed_errno in start_command 2013-03-21 14:06:48 -07:00
run-command.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c Merge branch 'mh/maint-ceil-absolute' 2013-02-27 09:47:28 -08:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c count-objects: report garbage files in pack directory too 2013-02-15 08:13:13 -08:00
sha1_name.c sha1_name: pass object name length to diagnose_invalid_sha1_path() 2013-03-17 00:10:51 -07:00
shallow.c
shell.c shell: new no-interactive-login command to print a custom message 2013-03-09 23:21:35 -08:00
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c Merge branch 'mh/ceiling' into maint 2013-01-28 11:07:18 -08:00
string-list.h Merge branch 'mh/ceiling' into maint 2013-01-28 11:07:18 -08:00
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-ctype.c
test-date.c
test-delta.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-dump-cache-tree.c
test-genrandom.c tests: use a lowercase "usage:" string 2013-02-24 21:30:10 -08:00
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c msvc: test-svn-fe: Fix linker "unresolved external" error 2013-02-25 12:40:34 -08:00
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
transport-helper.c
transport.c Merge branch 'maint' 2013-03-21 14:06:55 -07:00
transport.h Merge branch 'jc/push-reject-reasons' 2013-02-04 10:25:04 -08:00
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
upload-pack.c Merge branch 'jc/fetch-raw-sha1' 2013-03-21 14:02:27 -07:00
url.c
url.h
usage.c
userdiff.c
userdiff.h
utf8.c Merge branch 'jk/utf-8-can-be-spelled-differently' 2013-03-21 14:02:58 -07:00
utf8.h Merge branch 'jx/utf8-printf-width' into maint 2013-02-25 08:03:59 -08:00
varint.c
varint.h
version.c
version.h
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c Merge branch 'maint' 2013-03-21 14:06:55 -07:00
wt-status.h Merge branch 'tb/document-status-u-tradeoff' 2013-03-21 14:02:10 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, 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

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.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.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).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

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.