undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-rev-parse: parse ".." before simple SHA1's

Browse Source 
This fixes "<hexsha1>..*", since get_sha1() will happily ignore any
garbage at the end and thus we never got to the ".." check before.
This commit is contained in:
Linus Torvalds 2005-06-20 08:29:13 -07:00
parent fc4263ce4b
commit 800644c5cb
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rev-parse.c
View File

@ -78,20 +78,6 @@ int main(int argc, char **argv)
printf("%s\n", arg); printf("%s\n", arg);
continue; 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, ".."); dotdot = strstr(arg, "..");
if (dotdot) { if (dotdot) {
unsigned char end[20]; unsigned char end[20];
@ -111,6 +97,20 @@ int main(int argc, char **argv)
} }
*dotdot = '.'; *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) if (revs_only)
continue; continue;
def = NULL; def = NULL;