author | Junio C Hamano <gitster@pobox.com> | |
Mon, 24 Jan 2011 19:06:13 +0000 (11:06 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 24 Jan 2011 19:06:13 +0000 (11:06 -0800) | ||
commit | 08f177421047bc3124cf2cd917446de4a97062db | |
tree | 8df91aa775acd56fa7524c75bfa8bcdd61b670bc | tree | snapshot |
parent | c56cfa5dde233fbc2a459f8acd7743bae3060ba7 | commit | diff |
parent | ee47d9326448d290432ddedcc09e1058ef2893c8 | commit | diff |
Merge branch 'nd/struct-pathspec' into next
* nd/struct-pathspec: (21 commits)
t7810: overlapping pathspecs and depth limit
grep: drop pathspec_matches() in favor of tree_entry_interesting()
grep: use writable strbuf from caller for grep_tree()
grep: use match_pathspec_depth() for cache/worktree grepping
grep: convert to use struct pathspec
Convert ce_path_match() to use match_pathspec_depth()
Convert ce_path_match() to use struct pathspec
struct rev_info: convert prune_data to struct pathspec
pathspec: add match_pathspec_depth()
tree_entry_interesting(): optimize wildcard matching when base is matched
tree_entry_interesting(): support wildcard matching
tree_entry_interesting(): fix depth limit with overlapping pathspecs
tree_entry_interesting(): support depth limit
tree_entry_interesting(): refactor into separate smaller functions
diff-tree: convert base+baselen to writable strbuf
glossary: define pathspec
Move tree_entry_interesting() to tree-walk.c and export it
tree_entry_interesting(): remove dependency on struct diff_options
Convert struct diff_options to use struct pathspec
diff-no-index: use diff_tree_setup_paths()
...
Conflicts:
tree-diff.c
* nd/struct-pathspec: (21 commits)
t7810: overlapping pathspecs and depth limit
grep: drop pathspec_matches() in favor of tree_entry_interesting()
grep: use writable strbuf from caller for grep_tree()
grep: use match_pathspec_depth() for cache/worktree grepping
grep: convert to use struct pathspec
Convert ce_path_match() to use match_pathspec_depth()
Convert ce_path_match() to use struct pathspec
struct rev_info: convert prune_data to struct pathspec
pathspec: add match_pathspec_depth()
tree_entry_interesting(): optimize wildcard matching when base is matched
tree_entry_interesting(): support wildcard matching
tree_entry_interesting(): fix depth limit with overlapping pathspecs
tree_entry_interesting(): support depth limit
tree_entry_interesting(): refactor into separate smaller functions
diff-tree: convert base+baselen to writable strbuf
glossary: define pathspec
Move tree_entry_interesting() to tree-walk.c and export it
tree_entry_interesting(): remove dependency on struct diff_options
Convert struct diff_options to use struct pathspec
diff-no-index: use diff_tree_setup_paths()
...
Conflicts:
tree-diff.c
16 files changed:
Documentation/glossary-content.txt | diff1 | | diff2 | | blob | history |
builtin/add.c | diff1 | | diff2 | | blob | history |
builtin/diff.c | diff1 | | diff2 | | blob | history |
builtin/grep.c | diff1 | | diff2 | | blob | history |
builtin/log.c | diff1 | | diff2 | | blob | history |
builtin/update-index.c | diff1 | | diff2 | | blob | history |
cache.h | diff1 | | diff2 | | blob | history |
diff.h | diff1 | | diff2 | | blob | history |
dir.c | diff1 | | diff2 | | blob | history |
dir.h | diff1 | | diff2 | | blob | history |
read-cache.c | diff1 | | diff2 | | blob | history |
revision.c | diff1 | | diff2 | | blob | history |
t/t7810-grep.sh | diff1 | | diff2 | | blob | history |
tree-diff.c | diff1 | | diff2 | | blob | history |
tree-walk.c | diff1 | | diff2 | | blob | history |
wt-status.c | diff1 | | diff2 | | blob | history |