зеркало из https://github.com/microsoft/git.git
diff-index.c: unify handling of command line paths
Regardless of where in the directory hierarchy you are, "-" on the command line means the standard input. The old code knew too much about how the low level machinery uses paths to read from the working tree and did not bother to have the same check for "-" when the command is run from the top-level. Unify the codepaths for subdirectory case and toplevel case into one and make it clearer. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c20f592611
Коммит
3b069b1beb
|
@ -170,7 +170,7 @@ void diff_no_index(struct rev_info *revs,
|
||||||
int argc, const char **argv,
|
int argc, const char **argv,
|
||||||
int nongit, const char *prefix)
|
int nongit, const char *prefix)
|
||||||
{
|
{
|
||||||
int i;
|
int i, prefixlen;
|
||||||
int no_index = 0;
|
int no_index = 0;
|
||||||
unsigned options = 0;
|
unsigned options = 0;
|
||||||
const char *paths[2];
|
const char *paths[2];
|
||||||
|
@ -230,23 +230,18 @@ void diff_no_index(struct rev_info *revs,
|
||||||
if (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
|
if (!DIFF_OPT_TST(&revs->diffopt, EXIT_WITH_STATUS))
|
||||||
setup_pager();
|
setup_pager();
|
||||||
|
|
||||||
if (prefix) {
|
prefixlen = prefix ? strlen(prefix) : 0;
|
||||||
int len = strlen(prefix);
|
for (i = 0; i < 2; i++) {
|
||||||
|
const char *p = argv[argc - 2 + i];
|
||||||
for (i = 0; i < 2; i++) {
|
if (!strcmp(p, "-"))
|
||||||
const char *p = argv[argc - 2 + i];
|
|
||||||
/*
|
/*
|
||||||
* stdin should be spelled as '-'; if you have
|
* stdin should be spelled as "-"; if you have
|
||||||
* path that is '-', spell it as ./-.
|
* path that is "-", spell it as "./-".
|
||||||
*/
|
*/
|
||||||
p = (strcmp(p, "-")
|
p = p;
|
||||||
? xstrdup(prefix_filename(prefix, len, p))
|
else if (prefixlen)
|
||||||
: p);
|
p = xstrdup(prefix_filename(prefix, prefixlen, p));
|
||||||
paths[i] = p;
|
paths[i] = p;
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (i = 0; i < 2; i++)
|
|
||||||
paths[i] = argv[argc - 2 + i];
|
|
||||||
}
|
}
|
||||||
revs->diffopt.skip_stat_unmatch = 1;
|
revs->diffopt.skip_stat_unmatch = 1;
|
||||||
if (!revs->diffopt.output_format)
|
if (!revs->diffopt.output_format)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче