diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 14:34:53 -0700 |
| commit | 4da8cbc234177d6a8cf749d4ef60bd05ec843898 (patch) | |
| tree | a97b17b67a77e6d9f9b7cdf0aa265594db2ddeb4 /diff.h | |
| parent | b5b1442ac35706ce1e3daed407dd935f0e9dd796 (diff) | |
| parent | c4e05b1a2290c605e68e6dac5e2a580e6d4080b7 (diff) | |
| download | git-4da8cbc234177d6a8cf749d4ef60bd05ec843898.tar.gz git-4da8cbc234177d6a8cf749d4ef60bd05ec843898.tar.xz | |
Merge branch 'jc/diff' into next
* jc/diff:
blame and friends: adjust to multiple pathspec change.
git log --full-diff
tree-diff: do not assume we use only one pathspec
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -39,11 +39,15 @@ struct diff_options { int setup; int abbrev; + int nr_paths; + const char **paths; + int *pathlens; change_fn_t change; add_remove_fn_t add_remove; }; -extern void diff_tree_setup_paths(const char **paths); +extern void diff_tree_setup_paths(const char **paths, struct diff_options *); +extern void diff_tree_release_paths(struct diff_options *); extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt); extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, |