undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-no-index: use diff_tree_setup_paths()

Browse Source 
diff_options.{paths,nr_paths} will be removed later. Do not
modify them directly.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2010-12-15 22:02:37 +07:00 committed by Junio C Hamano
parent 0602f3e916
commit 16dc36fea8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
diff-no-index.c
View File

@ -231,8 +231,9 @@ void diff_no_index(struct rev_info *revs,
if (prefix) { if (prefix) {
int len = strlen(prefix); int len = strlen(prefix);
const char *paths[3];
memset(paths, 0, sizeof(paths));
revs->diffopt.paths = xcalloc(2, sizeof(char *));
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
const char *p = argv[argc - 2 + i]; const char *p = argv[argc - 2 + i];
/* /*
@ -242,12 +243,12 @@ void diff_no_index(struct rev_info *revs,
p = (strcmp(p, "-") p = (strcmp(p, "-")
? xstrdup(prefix_filename(prefix, len, p)) ? xstrdup(prefix_filename(prefix, len, p))
: p); : p);
revs->diffopt.paths[i] = p; paths[i] = p;
} }
diff_tree_setup_paths(paths, &revs->diffopt);
} }
else else
revs->diffopt.paths = argv + argc - 2; diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
revs->diffopt.nr_paths = 2;
revs->diffopt.skip_stat_unmatch = 1; revs->diffopt.skip_stat_unmatch = 1;
if (!revs->diffopt.output_format) if (!revs->diffopt.output_format)
revs->diffopt.output_format = DIFF_FORMAT_PATCH; revs->diffopt.output_format = DIFF_FORMAT_PATCH;