mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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:
parent
e551208dea
commit
ae792aa52b
14
diff-lib.c
14
diff-lib.c
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue