Go to file
Junio C Hamano 2eac2a4cc4 ls-files -k: a directory only can be killed if the index has a non-directory
"ls-files -o" and "ls-files -k" both traverse the working tree down
to find either all untracked paths or those that will be "killed"
(removed from the working tree to make room) when the paths recorded
in the index are checked out.  It is necessary to traverse the
working tree fully when enumerating all the "other" paths, but when
we are only interested in "killed" paths, we can take advantage of
the fact that paths that do not overlap with entries in the index
can never be killed.

The treat_one_path() helper function, which is called during the
recursive traversal, is the ideal place to implement an
optimization.

When we are looking at a directory P in the working tree, there are
three cases:

 (1) P exists in the index.  Everything inside the directory P in
     the working tree needs to go when P is checked out from the
     index.

 (2) P does not exist in the index, but there is P/Q in the index.
     We know P will stay a directory when we check out the contents
     of the index, but we do not know yet if there is a directory
     P/Q in the working tree to be killed, so we need to recurse.

 (3) P does not exist in the index, and there is no P/Q in the index
     to require P to be a directory, either.  Only in this case, we
     know that everything inside P will not be killed without
     recursing.

Note that this helper is called by treat_leading_path() that decides
if we need to traverse only subdirectories of a single common
leading directory, which is essential for this optimization to be
correct.  This caller checks each level of the leading path
component from shallower directory to deeper ones, and that is what
allows us to only check if the path appears in the index.  If the
call to treat_one_path() weren't there, given a path P/Q/R, the real
traversal may start from directory P/Q/R, even when the index
records P as a regular file, and we would end up having to check if
any leading subpath in P/Q/R, e.g. P, appears in the index.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-15 13:50:34 -07:00
Documentation Git 1.8.3 2013-05-24 11:34:46 -07:00
block-sha1
builtin ls-files -k: a directory only can be killed if the index has a non-directory 2013-08-15 13:50:34 -07:00
compat utf8.c: add reencode_string_len() that can handle NULs in string 2013-04-18 16:28:28 -07:00
contrib remote-hg: fix order of configuration comments 2013-05-21 09:33:24 -07:00
git-gui
git_remote_helpers
gitk-git Merge git://ozlabs.org/~paulus/gitk 2013-05-17 11:55:02 -07:00
gitweb gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM 2013-04-15 07:25:46 -07:00
mergetools Sync with v1.8.2.3 2013-05-09 13:32:54 -07:00
perl git-svn: added an --include-path flag 2013-05-09 01:13:36 +00:00
po gitk: Update Swedish translation (304t) 2013-05-17 09:25:25 +10:00
ppc
t git-svn: introduce --parents parameter for commands branch and tag 2013-05-20 22:05:54 +00:00
templates
vcs-svn
xdiff Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
.gitattributes
.gitignore
.mailmap mailmap: update Pasky's address 2013-04-04 13:03:34 -07:00
COPYING
GIT-VERSION-GEN Git 1.8.3-rc3 2013-05-17 12:19:20 -07:00
INSTALL Typo fix: replacing it's -> its 2013-04-11 17:39:05 -07:00
LGPL-2.1
Makefile Merge branch 'jk/common-make-variables-export-safety' 2013-04-01 08:59:47 -07:00
README
RelNotes Git 1.8.2.3 2013-05-09 13:31:17 -07:00
abspath.c
aclocal.m4
advice.c branch: give advice when tracking start-point is missing 2013-04-02 16:14:13 -07:00
advice.h branch: give advice when tracking start-point is missing 2013-04-02 16:14:13 -07:00
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'lf/read-blob-data-from-index' 2013-04-21 18:39:45 -07:00
attr.h
base85.c
bisect.c Merge branch 'jk/bisect-prn-unsigned' into maint 2013-04-12 13:41:46 -07:00
bisect.h
blob.c
blob.h
branch.c i18n: branch: mark strings for translation 2013-04-15 21:05:21 -07:00
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c bundle: Accept prerequisites without commit messages 2013-04-07 14:45:56 -07:00
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'lf/read-blob-data-from-index' 2013-04-21 18:39:45 -07:00
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit.c Sync with 'maint' 2013-04-12 13:54:01 -07:00
commit.h pretty: save commit encoding from logmsg_reencode if the caller needs it 2013-04-18 16:28:27 -07:00
config.c
config.mak.in Merge branch 'jc/remove-export-from-config-mak-in' 2013-04-01 09:00:02 -07:00
config.mak.uname convert: The native line-ending is \r\n on MinGW 2013-04-16 11:18:35 -07:00
configure.ac
connect.c
connected.c
connected.h
convert.c Merge branch 'lf/read-blob-data-from-index' 2013-04-21 18:39:45 -07: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 Merge branch 'jk/pkt-line-cleanup' 2013-04-01 08:59:37 -07:00
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c Merge branch 'jk/diff-algo-finishing-touches' into maint 2013-04-24 16:19:42 -07:00
diff.h
diffcore-break.c diffcore-break: don't divide by zero 2013-04-03 12:48:02 -07:00
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c diffcore-pickaxe: unify code for log -S/-G 2013-04-05 10:31:09 -07:00
diffcore-rename.c
diffcore.h
dir.c ls-files -k: a directory only can be killed if the index has a non-directory 2013-08-15 13:50:34 -07:00
dir.h ls-files -k: a directory only can be killed if the index has a non-directory 2013-08-15 13:50:34 -07:00
editor.c
entry.c Merge branch 'jk/check-corrupt-objects-carefully' 2013-04-03 09:34:29 -07:00
environment.c Merge branch 'jk/alias-in-bare' into maint 2013-04-03 09:25:41 -07:00
exec_cmd.c
exec_cmd.h
fast-import.c fast-import: Fix an gcc -Wuninitialized warning 2013-03-29 23:46:55 -07:00
fetch-pack.c Merge branch 'jk/pkt-line-cleanup' 2013-04-01 08:59:37 -07: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 Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
git-am.sh
git-archimport.perl
git-bisect.sh bisect: Log possibly bad, skipped commits at bisection end 2013-04-23 09:09:44 -07:00
git-compat-util.h Merge branch 'jk/a-thread-only-dies-once' into maint 2013-04-26 11:25:59 -07:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
git-difftool--helper.sh
git-difftool.perl difftool: fix dir-diff when file does not exist in working tree 2013-05-17 11:46:53 -07:00
git-filter-branch.sh Merge branch 'jk/filter-branch-come-back-to-original' into maint 2013-04-22 11:26:55 -07:00
git-instaweb.sh
git-lost-found.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-parse-remote.sh
git-pull.sh merge/pull: verify GPG signatures of commits being merged 2013-03-31 19:23:59 -07:00
git-quiltimport.sh Correct common spelling mistakes in comments and tests 2013-04-12 13:38:40 -07:00
git-rebase--am.sh rebase-am: explicitly disable cover-letter 2013-04-14 20:01:07 -07:00
git-rebase--interactive.sh bash-prompt.sh: show where rebase is at when stopped 2013-04-25 09:59:34 -07:00
git-rebase--merge.sh
git-rebase.sh Merge branch 'ph/rebase-original' 2013-04-26 15:28:34 -07:00
git-relink.perl
git-remote-testgit transport-helper: add 'signed-tags' capability 2013-04-15 09:04:43 -07:00
git-remote-testpy.py
git-repack.sh
git-request-pull.sh
git-send-email.perl send-email: make annotate configurable 2013-04-07 00:42:29 -07:00
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh Merge branch 'jl/submodule-deinit' 2013-04-05 14:15:13 -07:00
git-svn.perl git-svn: introduce --parents parameter for commands branch and tag 2013-05-20 22:05:54 +00:00
git-web--browse.sh git-web--browse: recognize any TERM_PROGRAM as a GUI terminal on OS X 2013-03-29 15:24:31 -07:00
git.c Merge branch 'jk/alias-in-bare' into maint 2013-04-03 09:25:41 -07:00
git.spec.in
gpg-interface.c Merge branch 'mg/gpg-interface-using-status' into maint 2013-04-03 09:26:27 -07:00
gpg-interface.h merge/pull Check for untrusted good GPG signatures 2013-03-31 22:38:49 -07:00
graph.c
graph.h
grep.c
grep.h
hash.c
hash.h
help.c help.c: add a compatibility comment to cmd_version() 2013-04-16 15:01:30 -07:00
help.h
hex.c
http-backend.c Merge branch 'jk/http-dumb-namespaces' 2013-04-18 11:49:21 -07:00
http-fetch.c
http-push.c http: drop http_error function 2013-04-06 18:56:46 -07:00
http-walker.c
http.c Merge branch 'mv/ssl-ftp-curl' 2013-04-19 13:31:08 -07:00
http.h Merge branch 'mv/ssl-ftp-curl' 2013-04-19 13:31:08 -07:00
ident.c
imap-send.c Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1 2013-04-03 08:35:33 -07:00
kwset.c kwset: fix spelling in comments 2013-04-12 12:25:08 -07:00
kwset.h
levenshtein.c
levenshtein.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
log-tree.c pretty: share code between format_decoration and show_decorations 2013-04-18 16:28:27 -07:00
log-tree.h pretty: share code between format_decoration and show_decorations 2013-04-18 16:28:27 -07:00
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c Sync with 1.8.1 maintenance track 2013-04-03 09:18:01 -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
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c path.c: optimize adjust_shared_perm() 2013-04-05 12:39:38 -07:00
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c Merge branch 'rs/pp-user-info-without-extra-allocation' 2013-05-01 15:24:08 -07:00
progress.c strbuf: create strbuf_humanise_bytes() to show byte sizes 2013-04-10 12:58:33 -07:00
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c Merge branch 'lf/read-blob-data-from-index' 2013-04-21 18:39:45 -07:00
reflog-walk.c
reflog-walk.h
refs.c Sync with 1.8.1 maintenance track 2013-04-03 09:18:01 -07:00
refs.h
remote-curl.c remote-curl: die directly with http error messages 2013-04-06 18:56:45 -07:00
remote-testsvn.c
remote.c remote.c: introduce branch.<name>.pushremote 2013-04-02 10:41:43 -07:00
remote.h remote.c: introduce a way to have different remotes for fetch/push 2013-04-02 10:41:42 -07:00
replace_object.c
rerere.c rerere forget: do not segfault if not all stages are present 2013-04-04 12:27:28 -07:00
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'tr/copy-revisions-from-stdin' into maint 2013-05-09 12:42:17 -07:00
revision.h Merge branch 'bc/append-signed-off-by' 2013-04-01 08:59:24 -07:00
run-command.c Merge branch 'jk/a-thread-only-dies-once' into maint 2013-04-26 11:25:59 -07:00
run-command.h
send-pack.c
send-pack.h
sequencer.c Merge branch 'mv/sequencer-pick-error-diag' 2013-05-09 13:30:19 -07:00
sequencer.h
server-info.c
setup.c Merge branch 'jk/alias-in-bare' into maint 2013-04-03 09:25:41 -07:00
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c Merge branch 'tr/unpack-entry-use-after-free-fix' 2013-05-03 15:18:04 -07:00
sha1_name.c Merge branch 'jc/sha1-name-object-peeler' 2013-04-03 09:34:54 -07:00
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
strbuf.c strbuf: create strbuf_humanise_bytes() to show byte sizes 2013-04-10 12:58:33 -07:00
strbuf.h strbuf: create strbuf_humanise_bytes() to show byte sizes 2013-04-10 12:58:33 -07:00
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c submodule: print graph output next to submodule log 2013-04-05 11:28:10 -07:00
submodule.h submodule: print graph output next to submodule log 2013-04-05 11:28:10 -07:00
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
thread-utils.c
thread-utils.h
trace.c
transport-helper.c Sync with v1.8.2.3 2013-05-09 13:32:54 -07:00
transport.c Merge branch 'jk/pkt-line-cleanup' 2013-04-01 08:59:37 -07:00
transport.h Sync with 'maint' 2013-04-12 13:54:01 -07: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 dir.c: replace is_path_excluded with now equivalent is_excluded API 2013-04-15 12:34:01 -07:00
unpack-trees.h dir.c: replace is_path_excluded with now equivalent is_excluded API 2013-04-15 12:34:01 -07:00
upload-pack.c Merge branch 'jk/peel-ref' into maint 2013-04-04 12:59:55 -07:00
url.c
url.h
usage.c Merge branch 'jk/a-thread-only-dies-once' into maint 2013-04-26 11:25:59 -07:00
userdiff.c
userdiff.h
utf8.c pretty: Fix bug in truncation support for %>, %< and %>< 2013-04-28 12:09:37 -07:00
utf8.h pretty: support %>> that steal trailing spaces 2013-04-18 16:28:29 -07: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 dir.c: git-status --ignored: don't scan the work tree twice 2013-04-15 12:36:42 -07:00
wt-status.h status: show commit sha1 in "You are currently reverting" message 2013-04-02 14:22:56 -07:00
xdiff-interface.c
xdiff-interface.h
zlib.c zlib: fix compilation failures with Sun C Compilaer 2013-04-22 09:49:04 -07:00

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.