Go to file
René Scharfe d8febde370 match-trees: simplify score_trees() using tree_entry()
Convert the loop in score_trees() to tree_entry().  The code becomes
shorter and simpler because the calls to update_tree_entry() are not
needed any more.

Another benefit is that we need less variables to track the current
tree entries; as a side-effect of that the compiler has an easier
job figuring out the control flow and thus can avoid false warnings
about uninitialized variables.

Using struct name_entry also allows the use of tree_entry_len() for
finding the path length instead of strlen(), which may be slightly
more efficient.

Also unify the handling of missing entries in one of the two trees
(i.e. added or removed files): Just set cmp appropriately first, no
matter if we ran off the end of a tree or if we actually have two
entries to compare, and check its value a bit later without
duplicating the handler code.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-25 09:00:30 -07:00
Documentation Merge branch 'maint' 2013-03-17 00:11:11 -07:00
block-sha1
…
builtin drop some obsolete "x = x" compiler warning hacks 2013-03-21 14:06:38 -07:00
compat Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
contrib Merge branch 'mp/complete-paths' 2013-03-11 10:32:16 -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 git svn: consistent spacing after "W:" in warnings 2013-03-08 09:53:57 +00:00
po l10n: zh_CN.po: translate 1 new message 2013-03-07 08:46:19 +08:00
ppc
…
t Merge branch 'maint' 2013-03-17 15:39:43 -07:00
templates Add sample pre-push hook script 2013-01-18 11:13:22 -08:00
vcs-svn
…
xdiff
…
.gitattributes
…
.gitignore gitk: Ignore gitk-wish buildproduct 2013-01-30 21:12:16 +11:00
.mailmap
…
COPYING
…
GIT-VERSION-GEN Git 1.8.2 2013-03-13 11:28:08 -07:00
INSTALL INSTALL: git-p4 does not support Python 3 2013-01-30 11:17:59 -08:00
LGPL-2.1
…
Makefile Merge branch 'maint' 2013-03-17 00:11:11 -07:00
README Merge branch 'ta/doc-no-small-caps' 2013-02-05 16:13:32 -08:00
RelNotes Prepare for 1.8.1.5 2013-02-25 08:26:25 -08:00
abspath.c
…
aclocal.m4
…
advice.c push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
advice.h push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
alias.c
…
alloc.c
…
archive-tar.c archive-tar: use parse_config_key when parsing config 2013-01-23 08:41:50 -08:00
archive-zip.c Merge branch 'rs/zip-with-uncompressed-size-in-the-header' into maint 2013-01-20 17:22:27 -08:00
archive.c Add directory pattern matching to attributes 2012-12-17 22:07:23 -08:00
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 Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
bulk-checkin.c
…
bulk-checkin.h
…
bundle.c
…
bundle.h
…
cache-tree.c cache-tree: invalidate i-t-a paths after generating trees 2012-12-15 23:04:22 -08:00
cache-tree.h cache-tree: fix writing cache-tree when CE_REMOVE is present 2012-12-15 23:04:22 -08:00
cache.h Merge branch 'jc/push-reject-reasons' 2013-02-04 10:25:04 -08: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 Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
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 Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08: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 some config callbacks to parse_config_key 2013-01-23 08:41:50 -08: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
…
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
…
diffcore.h
…
dir.c Merge branch 'ap/status-ignored-in-ignored-directory' into maint 2013-01-28 11:10:25 -08:00
dir.h Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
editor.c run-command: encode signal death as a positive integer 2013-01-06 11:09:18 -08:00
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 'jk/gc-auto-after-fetch' 2013-02-01 12:40:16 -08:00
fetch-pack.h
…
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-bisect.sh
…
git-compat-util.h Revert "compat: add strtok_r()" 2013-02-26 09:16:58 -08:00
git-cvsexportcommit.perl
…
git-cvsimport.perl cvsimport: format commit timestamp ourselves without using strftime 2013-02-09 14:41:49 -08:00
git-cvsserver.perl
…
git-difftool--helper.sh difftool--helper: fix printf usage 2013-02-10 11:35:50 -08:00
git-difftool.perl git-difftool: use git-mergetool--lib for "--tool-help" 2013-01-25 11:08:55 -08:00
git-filter-branch.sh
…
git-instaweb.sh
…
git-lost-found.sh
…
git-merge-octopus.sh
…
git-merge-one-file.sh
…
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-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 Merge branch 'nz/send-email-headers-are-case-insensitive' into maint 2013-01-20 17:22:49 -08:00
git-sh-i18n.sh
…
git-sh-setup.sh Merge branch 'jc/maint-fbsd-sh-ifs-workaround' into maint 2013-01-08 11:17:01 -08:00
git-stash.sh
…
git-submodule.sh Allow custom "comment char" 2013-01-16 12:48:22 -08:00
git-svn.perl git-svn: Simplify calculation of GIT_DIR 2013-01-24 10:21:23 +00: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 'sb/gpg-plug-fd-leak' into maint 2013-02-07 15:14:54 -08:00
gpg-interface.h
…
graph.c graph: output padding for merge subsequent parents 2013-02-07 12:54:26 -08:00
graph.h
…
grep.c
…
grep.h
…
hash.c
…
hash.h
…
help.c help: include <common-cmds.h> only in one file 2013-01-18 22:35:04 -08:00
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 Sync with v1.8.1.4 2013-02-19 21:57:27 -08:00
kwset.c
…
kwset.h
…
levenshtein.c
…
levenshtein.h
…
list-objects.c
…
list-objects.h
…
ll-merge.c convert some config callbacks to parse_config_key 2013-01-23 08:41:50 -08:00
ll-merge.h
…
lockfile.c
…
log-tree.c Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
log-tree.h get_patch_filename(): split into two functions 2012-12-21 23:55:40 -08:00
mailmap.c Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
mailmap.h mailmap: simplify map_user() interface 2013-01-10 12:33:08 -08:00
match-trees.c match-trees: simplify score_trees() using tree_entry() 2013-03-25 09:00:30 -07:00
merge-blobs.c
…
merge-blobs.h
…
merge-recursive.c diff: Introduce --diff-algorithm command line option 2013-01-16 09:41:18 -08:00
merge-recursive.h
…
merge.c
…
mergesort.c
…
mergesort.h
…
name-hash.c name-hash: allow hashing an empty string 2013-02-19 14:00:12 -08: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 fix clang -Wunused-value warnings for error functions 2013-01-16 12:47:46 -08:00
patch-delta.c
…
patch-ids.c
…
patch-ids.h
…
path.c
…
pathspec.c add.c: extract new die_if_path_beyond_symlink() for reuse 2013-01-06 14:26:37 -08:00
pathspec.h add.c: extract new die_if_path_beyond_symlink() for reuse 2013-01-06 14:26:37 -08:00
pkt-line.c
…
pkt-line.h
…
preload-index.c
…
pretty.c logmsg_reencode: lazily load missing commit buffers 2013-01-26 13:28:22 -08:00
progress.c
…
progress.h
…
prompt.c
…
prompt.h
…
quote.c
…
quote.h
…
reachable.c
…
reachable.h
…
read-cache.c Enable minimal stat checking 2013-01-22 09:33:16 -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
remote-curl.c Verify Content-Type from smart HTTP servers 2013-02-04 10:22:36 -08:00
remote-testsvn.c remote-testsvn: fix unitialized variable 2012-12-15 10:43:11 -08:00
remote.c Merge branch 'jc/push-reject-reasons' 2013-02-04 10:25:04 -08:00
remote.h
…
replace_object.c
…
rerere.c
…
rerere.h
…
resolve-undo.c
…
resolve-undo.h
…
revision.c log: re-encode commit messages before grepping 2013-02-11 13:11:45 -08:00
revision.h Merge branch 'ap/log-mailmap' 2013-01-20 17:06:53 -08:00
run-command.c run-command: always set failed_errno in start_command 2013-03-21 14:06:48 -07:00
run-command.h hooks: Add function to check if a hook exists 2013-01-14 09:25:40 -08:00
send-pack.c push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
send-pack.h
…
sequencer.c learn to pick/revert into unborn branch 2012-12-23 10:40:37 -08:00
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
…
sha1_name.c sha1_name: pass object name length to diagnose_invalid_sha1_path() 2013-03-17 00:10:51 -07:00
shallow.c upload-pack: fix off-by-one depth calculation in shallow clone 2013-01-11 09:10:57 -08:00
shell.c
…
shortlog.h
…
show-index.c
…
sideband.c
…
sideband.h
…
sigchain.c
…
sigchain.h
…
strbuf.c Allow custom "comment char" 2013-01-16 12:48:22 -08:00
strbuf.h Allow custom "comment char" 2013-01-16 12:48:22 -08:00
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: clarify logic in show_submodule_summary 2013-03-22 14:09:55 -07:00
submodule.h
…
symlinks.c
…
tag.c
…
tag.h
…
tar.h
…
test-chmtime.c
…
test-ctype.c
…
test-date.c
…
test-delta.c
…
test-dump-cache-tree.c
…
test-genrandom.c
…
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
…
test-wildmatch.c Makefile: add USE_WILDMATCH to use wildmatch as fnmatch 2013-01-01 15:32:37 -08:00
thread-utils.c
…
thread-utils.h
…
trace.c
…
transport-helper.c push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE 2013-01-24 14:37:23 -08:00
transport.c transport: drop "int cmp = cmp" hack 2013-03-21 14:06:44 -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 Merge branch 'as/check-ignore' 2013-01-23 21:19:10 -08:00
unpack-trees.h
…
upload-pack.c Merge branch 'jc/hidden-refs' 2013-02-17 15:25:57 -08:00
url.c
…
url.h
…
usage.c make error()'s constant return value more visible 2012-12-15 10:45:58 -08:00
userdiff.c userdiff: drop parse_driver function 2013-01-23 08:41:51 -08:00
userdiff.h
…
utf8.c Merge branch 'jx/utf8-printf-width' into maint 2013-02-25 08:03:59 -08: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: advance faster in <asterisk> + <literal> patterns 2013-01-01 15:32:37 -08:00
wildmatch.h wildmatch: support "no FNM_PATHNAME" mode 2013-01-01 15:32:37 -08:00
wrap-for-bin.sh
…
wrapper.c Merge branch 'jn/warn-on-inaccessible-loosen' into maint 2013-01-11 16:47:07 -08:00
write_or_die.c
…
ws.c
…
wt-status.c wt-status: fix possible use of uninitialized variable 2013-03-21 14:06:49 -07:00
wt-status.h status: show the branch name if possible in in-progress info 2013-02-05 08:21:02 -08:00
xdiff-interface.c
…
xdiff-interface.h
…
zlib.c
…

README

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

	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.