X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rev-parse.c;h=e956cd5ed54906335f0b07e9b522a869bfddd218;hb=ce4a706388bd26a3f897bb41a397113f1076ffc6;hp=f176c56f7f896df7d955d1f75e01c464f1aefaf0;hpb=384e99a4a99820c34fe3600b2aad3f0185dd43db;p=git.git diff --git a/rev-parse.c b/rev-parse.c index f176c56f..e956cd5e 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -315,16 +315,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 = '.'; }