user/sven/git.git/dir.h, branch v1.8.0.2

Merge branch 'nd/exclude-workaround-top-heavy'

2012-06-28T22:19:57Z

Attempt to optimize matching with an exclude pattern with a deep directory hierarchy by taking the part that specifies leading path without wildcard literally.

Merge branch 'jc/ls-files-i-dir'

2012-06-21T21:42:07Z

"git ls-files --exclude=t -i" did not consider anything under t/ as excluded, as it did not pay attention to exclusion of leading paths while walking the index. Other two users of excluded() are also updated. * jc/ls-files-i-dir: dir.c: make excluded() file scope static unpack-trees.c: use path_excluded() in check_ok_to_remove() builtin/add.c: use path_excluded() path_excluded(): update API to less cache-entry centric ls-files -i: micro-optimize path_excluded() ls-files -i: pay attention to exclusion of leading paths

exclude: do strcmp as much as possible before fnmatch

2012-06-07T18:33:38Z

this also avoids calling fnmatch() if the non-wildcard prefix is longer than basename Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

dir.c: make excluded() file scope static

2012-06-06T05:26:12Z

Now there no longer is external callers of this interface, so we can make it static. Signed-off-by: Junio C Hamano

path_excluded(): update API to less cache-entry centric

2012-06-06T04:22:36Z

It was stupid of me to make the API too much cache-entry specific; the caller may want to check arbitrary pathname without having a corresponding cache-entry to see if a path is ignored. Signed-off-by: Junio C Hamano

ls-files -i: pay attention to exclusion of leading paths

2012-06-03T23:05:42Z

"git ls-files --exclude=t/ -i" does not show paths in directory t/ that have been added to the index, but it should. The excluded() API was designed for callers who walk the tree from the top, checking each level of the directory hierarchy as it descends if it is excluded, and not even bothering to recurse into an excluded directory. This would allow us optimize for a common case by not having to check if the exclude pattern "foo/" matches when looking at "foo/bar", because the caller should have noticed that "foo" is excluded and did not even bother to read "foo/bar" out of opendir()/readdir() to call it. The code for "ls-files -i" however walks the index linearly, feeding paths without checking if the leading directory is already excluded. Introduce a helper function path_excluded() to let this caller properly call excluded() check for higher hierarchies as necessary. Signed-off-by: Junio C Hamano

remove_dir_recursively(): Add flag for skipping removal of toplevel dir

2012-03-15T18:12:25Z

Add the REMOVE_DIR_KEEP_TOPLEVEL flag to remove_dir_recursively() for deleting everything inside the given directory, but _not_ the given directory itself. Note that this does not pass the REMOVE_DIR_KEEP_NESTED_GIT flag, if set, to the recursive invocations of remove_dir_recursively(). It is likely to be a a bug that has been present since REMOVE_DIR_KEEP_NESTED_GIT was introduced (a0f4afb), but this commit keeps the same behaviour for now. Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano

rename pathspec_prefix() to common_prefix() and move to dir.[ch]

2011-09-12T21:38:32Z

Also make common_prefix_len() static as this refactoring makes dir.c itself the only caller of this helper function. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano

consolidate pathspec_prefix and common_prefix

2011-09-06T19:54:19Z

The implementation from pathspec_prefix (slightly modified) replaces the current common_prefix, because it also respects glob characters. Based on a patch by Clemens Buchacher. Signed-off-by: Junio C Hamano

Merge branch 'nd/maint-setup'

2011-05-02T22:58:30Z

* nd/maint-setup: Kill off get_relative_cwd() setup: return correct prefix if worktree is '/' Conflicts: dir.c setup.c