X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-parse.c;h=b82f294a78994e512c4f30da5bb4ba3eca3f95b4;hb=8bb2e03b9d47d87657b67ddfaf712e736cf3db8f;hp=9cec33b8c00c322d6acde3e588a5c1dfe53f948d;hpb=9523a4c2fcd7bbccbbddb998eef891ae83cf91a3;p=git.git diff --git a/rev-parse.c b/rev-parse.c index 9cec33b8..b82f294a 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -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)