diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-10 23:39:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-10 23:45:19 (GMT) |
| commit | a8baa7b9f5c8e338c09d63097f14372aca68e13f (patch) | |
| tree | b194ad2948ea2e797c062eb67f4d1a9f75c7b3a8 /diff-tree.c | |
| parent | 6d46a23bf6e009487166f044b8c759aa734b8f90 (diff) | |
| download | git-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 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree.c b/diff-tree.c index 2a088d1..2b79dd0 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -120,7 +120,7 @@ int main(int argc, const char **argv) if (opt->diffopt.output_format == DIFF_FORMAT_PATCH) opt->diffopt.recursive = 1; - diff_tree_setup_paths(get_pathspec(prefix, argv)); + diff_tree_setup_paths(get_pathspec(prefix, argv), opt); diff_setup_done(&opt->diffopt); switch (nr_sha1) { |