user/sven/git.git/dir.c, branch v1.7.7.4

Merge branch 'nd/struct-pathspec'

2011-05-06T17:50:06Z

* nd/struct-pathspec: pathspec: rename per-item field has_wildcard to use_wildcard Improve tree_entry_interesting() handling code Convert read_tree{,_recursive} to support struct pathspec Reimplement read_tree_recursive() using tree_entry_interesting()

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

Merge branch 'ar/clean-rmdir-empty'

2011-04-27T18:36:41Z

* ar/clean-rmdir-empty: clean: unreadable directory may still be rmdir-able if it is empty

pathspec: rename per-item field has_wildcard to use_wildcard

2011-04-05T16:30:36Z

As the point of the last change is to allow use of strings as literals no matter what characters are in them, "has_wildcard" does not match what we use this field for anymore. It is used to decide if the wildcard matching should be used, so rename it to match the usage better. Signed-off-by: Junio C Hamano

clean: unreadable directory may still be rmdir-able if it is empty

2011-04-01T18:16:21Z

As a last ditch effort, try rmdir(2) when we cannot read the directory to be removed. It may be an empty directory that we can remove without any permission, as long as we can modify its parent directory. Noticed by Linus. Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano

Kill off get_relative_cwd()

2011-03-29T00:02:57Z

Function dir_inside_of() does something similar (correctly), but looks easier to understand and does not bundle cwd to its business. Given get_relative_cwd's only user is is_inside_dir, we can kill it for good. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

setup: return correct prefix if worktree is '/'

2011-03-29T00:01:15Z

The same old problem reappears after setup code is reworked. We tend to assume there is at least one path component in a path and forget that path can be simply '/'. Reported-by: Matthijs Kooijman Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Name make_*_path functions more accurately

2011-03-17T23:08:30Z

Rename the make_*_path functions so it's clearer what they do, in particlar make clear what the differnce between make_absolute_path and make_nonrelative_path is by renaming them real_path and absolute_path respectively. make_relative_path has an understandable name and is renamed to relative_path to maintain the name convention. The function calls have been replaced 1-to-1 in their usage. Signed-off-by: Carlos Martín Nieto Signed-off-by: Junio C Hamano

pathspec: add match_pathspec_depth()

2011-02-03T22:08:30Z

match_pathspec_depth() is a clone of match_pathspec() except that it can take depth limit. Computation is a bit lighter compared to match_pathspec() because it's usually precomputed and stored in struct pathspec. In long term, match_pathspec() and match_one() should be removed in favor of this function. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

tree_entry_interesting(): support wildcard matching

2011-02-03T22:08:30Z

never_interesting optimization is disabled if there is any wildcard pathspec, even if it only matches exactly on trees. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano