diff-ni: allow running from a subdirectory.

When run from a subdirectory of a repository, the command forgot
to adjust paths given to it with prefix.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-03-03 23:45:14 -08:00
Родитель e551208dea
Коммит ae792aa52b
1 изменённых файлов: 13 добавлений и 1 удалений

Просмотреть файл

@ -248,7 +248,19 @@ int setup_diff_no_index(struct rev_info *revs,
die("invalid diff option/value: %s", argv[i]); die("invalid diff option/value: %s", argv[i]);
i += j; i += j;
} }
revs->diffopt.paths = argv + argc - 2;
if (prefix) {
int len = strlen(prefix);
revs->diffopt.paths = xcalloc(2, sizeof(char*));
for (i = 0; i < 2; i++) {
const char *p;
p = prefix_filename(prefix, len, argv[argc - 2 + i]);
revs->diffopt.paths[i] = xstrdup(p);
}
}
else
revs->diffopt.paths = argv + argc - 2;
revs->diffopt.nr_paths = 2; revs->diffopt.nr_paths = 2;
revs->max_count = -2; revs->max_count = -2;
return 0; return 0;