From 800644c5cb3aad99a229a09112f42fa88b63c1c4 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 20 Jun 2005 08:29:13 -0700 Subject: git-rev-parse: parse ".." before simple SHA1's This fixes "..*", since get_sha1() will happily ignore any garbage at the end and thus we never got to the ".." check before. --- rev-parse.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/rev-parse.c b/rev-parse.c index fd5f2ddca..1f4f3240d 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -78,20 +78,6 @@ int main(int argc, char **argv) printf("%s\n", arg); continue; } - if (!get_sha1(arg, sha1)) { - if (no_revs) - continue; - def = NULL; - printf("%s\n", sha1_to_hex(sha1)); - continue; - } - if (*arg == '^' && !get_sha1(arg+1, sha1)) { - if (no_revs) - continue; - def = NULL; - printf("^%s\n", sha1_to_hex(sha1)); - continue; - } dotdot = strstr(arg, ".."); if (dotdot) { unsigned char end[20]; @@ -111,6 +97,20 @@ int main(int argc, char **argv) } *dotdot = '.'; } + if (!get_sha1(arg, sha1)) { + if (no_revs) + continue; + def = NULL; + printf("%s\n", sha1_to_hex(sha1)); + continue; + } + if (*arg == '^' && !get_sha1(arg+1, sha1)) { + if (no_revs) + continue; + def = NULL; + printf("^%s\n", sha1_to_hex(sha1)); + continue; + } if (revs_only) continue; def = NULL; -- cgit v1.2.1