diff-index.c: do not pretend paths are pathspecs
"git diff --no-index" takes exactly two paths, not pathspecs, and has its own way queue_diff() to populate the diff_queue. Do not call diff_tree_setup_paths(), pretending as it takes pathspecs. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jun 27, 2012 at 11:51 UTC
c20f592611c2760a14d37fa1780afd2093159aeb
1 file changed
+5
-7
diff-no-index.c
+5
-7
@@ -173,6 +173,7 @@ void diff_no_index(struct rev_info *revs,
173
int i;
174
int no_index = 0;
175
unsigned options = 0;
176
+ const char *paths[2];
177
178
/* Were we asked to do --no-index explicitly? */
179
for (i = 1; i < argc; i++) {
@@ -231,8 +232,6 @@ void diff_no_index(struct rev_info *revs,
232
233
if (prefix) {
234
int len = strlen(prefix);
234
- const char *paths[3];
235
- memset(paths, 0, sizeof(paths));
235
236
for (i = 0; i < 2; i++) {
237
const char *p = argv[argc - 2 + i];
@@ -245,10 +244,10 @@ void diff_no_index(struct rev_info *revs,
244
: p);
245
paths[i] = p;
246
}
248
- diff_tree_setup_paths(paths, &revs->diffopt);
247
+ } else {
248
+ for (i = 0; i < 2; i++)
249
+ paths[i] = argv[argc - 2 + i];
250
}
250
- else
251
- diff_tree_setup_paths(argv + argc - 2, &revs->diffopt);
251
revs->diffopt.skip_stat_unmatch = 1;
252
if (!revs->diffopt.output_format)
253
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
@@ -260,8 +259,7 @@ void diff_no_index(struct rev_info *revs,
259
if (diff_setup_done(&revs->diffopt) < 0)
260
die("diff_setup_done failed");
261
263
- if (queue_diff(&revs->diffopt, revs->diffopt.pathspec.raw[0],
264
- revs->diffopt.pathspec.raw[1]))
262
+ if (queue_diff(&revs->diffopt, paths[0], paths[1]))
263
exit(1);
264
diff_set_mnemonic_prefix(&revs->diffopt, "1/", "2/");
265
diffcore_std(&revs->diffopt);