提交 9ad0a933 编写于 作者: L Linus Torvalds 提交者: Junio C Hamano

rev-parse lstat() workaround cleanup.

Earlier we had a workaround to avoid misspelled revision name to
be taken as a filename when "--no-revs --no-flags" are in
effect.  This cleans up the logic.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
上级 2718435b
......@@ -150,11 +150,14 @@ static void show_datestring(const char *flag, const char *datestr)
show(buffer);
}
static void show_file(const char *arg)
static int show_file(const char *arg)
{
show_default();
if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) {
show(arg);
return 1;
}
return 0;
}
int main(int argc, char **argv)
......@@ -329,14 +332,13 @@ int main(int argc, char **argv)
show_rev(REVERSED, sha1, arg+1);
continue;
}
as_is = 1;
if (!show_file(arg))
continue;
if (verify)
die("Needed a single revision");
if ((filter & DO_REVS) &&
(filter & DO_NONFLAGS) && /* !def && */
lstat(arg, &st) < 0)
if (lstat(arg, &st) < 0)
die("'%s': %s", arg, strerror(errno));
as_is = 1;
show_file(arg);
}
show_default();
if (verify && revs_count != 1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册