mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/diff' into next

Browse Source 
* jc/diff:
  blame and friends: adjust to multiple pathspec change.
  git log --full-diff
  tree-diff: do not assume we use only one pathspec
This commit is contained in:
Junio C Hamano
2006-04-11 14:34:53 -07:00
parent b5b1442ac3 c4e05b1a22
commit 4da8cbc234
9 changed files with 77 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff.h
View File

@ -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,