diff-no-index: use diff_tree_setup_paths()
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>
Nguyễn Thái Ngọc Duy committed
Dec 15, 2010 at 22:02 UTC
16dc36fea87e917a7f734400eb91e62e170db1a8
1 file changed
+5
-4
diff-no-index.c
+5
-4
@@ -231,8 +231,9 @@ void diff_no_index(struct rev_info *revs,
231
232
if (prefix) {
233
int len = strlen(prefix);
234
+ const char *paths[3];
235
+ memset(paths, 0, sizeof(paths));
236
235
- revs->diffopt.paths = xcalloc(2, sizeof(char *));
237
for (i = 0; i < 2; i++) {
238
const char *p = argv[argc - 2 + i];
239
/*
@@ -242,12 +243,12 @@ void diff_no_index(struct rev_info *revs,
243
p = (strcmp(p, "-")
244
? xstrdup(prefix_filename(prefix, len, p))
245
: p);
245
- revs->diffopt.paths[i] = p;
246
+ paths[i] = p;
247
}
248
+ diff_tree_setup_paths(paths, &revs->diffopt);
249
}
250
else
249
- revs->diffopt.paths = argv + argc - 2;
250
- revs->diffopt.nr_paths = 2;
251
+ diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
252
revs->diffopt.skip_stat_unmatch = 1;
253
if (!revs->diffopt.output_format)
254
revs->diffopt.output_format = DIFF_FORMAT_PATCH;