projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ts/doctar'
[git.git]
/
blame.c
diff --git
a/blame.c
b/blame.c
index
07d2d27
..
99ceea8
100644
(file)
--- a/
blame.c
+++ b/
blame.c
@@
-515,9
+515,9
@@
static int compare_tree_path(struct rev_info* revs,
paths[1] = NULL;
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
paths[1] = NULL;
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
- &revs->
diffopt
);
+ &revs->
pruning
);
ret = rev_compare_tree(revs, c1->tree, c2->tree);
ret = rev_compare_tree(revs, c1->tree, c2->tree);
- diff_tree_release_paths(&revs->
diffopt
);
+ diff_tree_release_paths(&revs->
pruning
);
return ret;
}
return ret;
}
@@
-531,9
+531,9
@@
static int same_tree_as_empty_path(struct rev_info *revs, struct tree* t1,
paths[1] = NULL;
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
paths[1] = NULL;
diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
- &revs->
diffopt
);
+ &revs->
pruning
);
ret = rev_same_tree_as_empty(revs, t1);
ret = rev_same_tree_as_empty(revs, t1);
- diff_tree_release_paths(&revs->
diffopt
);
+ diff_tree_release_paths(&revs->
pruning
);
return ret;
}
return ret;
}
@@
-834,7
+834,7
@@
int main(int argc, const char **argv)
args[0] = filename;
args[1] = NULL;
args[0] = filename;
args[1] = NULL;
- diff_tree_setup_paths(args, &rev.
diffopt
);
+ diff_tree_setup_paths(args, &rev.
pruning
);
prepare_revision_walk(&rev);
process_commits(&rev, filename, &initial);
prepare_revision_walk(&rev);
process_commits(&rev, filename, &initial);