summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-10 23:39:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-10 23:45:19 (GMT)
commita8baa7b9f5c8e338c09d63097f14372aca68e13f (patch)
treeb194ad2948ea2e797c062eb67f4d1a9f75c7b3a8 /revision.c
parent6d46a23bf6e009487166f044b8c759aa734b8f90 (diff)
downloadgit-a8baa7b9f5c8e338c09d63097f14372aca68e13f.zip
git-a8baa7b9f5c8e338c09d63097f14372aca68e13f.tar.gz
git-a8baa7b9f5c8e338c09d63097f14372aca68e13f.tar.bz2
tree-diff: do not assume we use only one pathspec
The way tree-diff was set up assumed we would use only one set of pathspec during the entire life of the program. Move the pathspec related static variables out to diff_options structure so that we can filter commits with one set of paths while show the actual diffs using different set of paths. I suspect this breaks blame.c, and makes "git log paths..." to default to the --full-diff, the latter of which is dealt with the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index fe26562..634f9a5 100644
--- a/revision.c
+++ b/revision.c
@@ -707,7 +707,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
revs->limited = 1;
if (revs->prune_data) {
- diff_tree_setup_paths(revs->prune_data);
+ diff_tree_setup_paths(revs->prune_data, &diff_opt);
revs->prune_fn = try_to_simplify_commit;
}