X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=62e16af33c29ddd6a9c8b2d9755dc11804d86bc4;hb=97d4df0b29d262df291985aed486e226b43132d0;hp=f176c56f7f896df7d955d1f75e01c464f1aefaf0;hpb=d93067d9c7fb210766c7282d662289f54d53f93a;p=git.git diff --git a/rev-parse.c b/rev-parse.c index f176c56f..62e16af3 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -169,14 +169,12 @@ int main(int argc, char **argv) git_config(git_default_config); for (i = 1; i < argc; i++) { - struct stat st; char *arg = argv[i]; char *dotdot; if (as_is) { if (show_file(arg) && as_is < 2) - if (lstat(arg, &st) < 0) - die("'%s': %s", arg, strerror(errno)); + verify_filename(prefix, arg); continue; } if (!strcmp(arg,"-n")) { @@ -315,16 +313,17 @@ int main(int argc, char **argv) dotdot = strstr(arg, ".."); if (dotdot) { unsigned char end[20]; - char *n = dotdot+2; + char *next = dotdot + 2; + char *this = arg; *dotdot = 0; - if (!get_sha1(arg, sha1)) { - if (!*n) - n = "HEAD"; - if (!get_sha1(n, end)) { - show_rev(NORMAL, end, n); - show_rev(REVERSED, sha1, arg); - continue; - } + if (!*next) + next = "HEAD"; + if (dotdot == arg) + this = "HEAD"; + if (!get_sha1(this, sha1) && !get_sha1(next, end)) { + show_rev(NORMAL, end, next); + show_rev(REVERSED, sha1, this); + continue; } *dotdot = '.'; } @@ -341,8 +340,7 @@ int main(int argc, char **argv) continue; if (verify) die("Needed a single revision"); - if (lstat(arg, &st) < 0) - die("'%s': %s", arg, strerror(errno)); + verify_filename(prefix, arg); } show_default(); if (verify && revs_count != 1)