kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

tree-diff: no need to pass match to skip_uninteresting() 

It is neither used there as input, nor the output written through it, is
used outside.

Signed-off-by: Kirill Smelkov <kirr@mns.spb.ru>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Kirill Smelkov 2014-02-03 16:47:18 +04:00 committed by Junio C Hamano
parent e197c2b650
commit e906612121
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tree-diff.c
View File

@ -109,13 +109,14 @@ static void show_entry(struct diff_options *opt, const char *prefix,
} }


static void skip_uninteresting(struct tree_desc *t, struct strbuf *base, static void skip_uninteresting(struct tree_desc *t, struct strbuf *base,
struct diff_options *opt, struct diff_options *opt)
enum interesting *match)
{ {
enum interesting match;

while (t->size) { while (t->size) {
*match = tree_entry_interesting(&t->entry, base, 0, &opt->pathspec); match = tree_entry_interesting(&t->entry, base, 0, &opt->pathspec);
if (*match) { if (match) {
if (*match == all_entries_not_interesting) if (match == all_entries_not_interesting)
t->size = 0; t->size = 0;
break; break;
} }
@ -128,8 +129,6 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
{ {
struct strbuf base; struct strbuf base;
int baselen = strlen(base_str); int baselen = strlen(base_str);
enum interesting t1_match = entry_not_interesting;
enum interesting t2_match = entry_not_interesting;


/* Enable recursion indefinitely */ /* Enable recursion indefinitely */
opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE); opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);
@ -141,8 +140,8 @@ int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
if (diff_can_quit_early(opt)) if (diff_can_quit_early(opt))
break; break;
if (opt->pathspec.nr) { if (opt->pathspec.nr) {
skip_uninteresting(t1, &base, opt, &t1_match); skip_uninteresting(t1, &base, opt);
skip_uninteresting(t2, &base, opt, &t2_match); skip_uninteresting(t2, &base, opt);
} }
if (!t1->size) { if (!t1->size) {
if (!t2->size) if (!t2->size)