diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | rev-parse.c | 70 |
2 files changed, 72 insertions, 1 deletions
@@ -33,7 +33,7 @@ PROG= git-update-cache git-diff-files git-init-db git-write-tree \ git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \ git-diff-helper git-tar-tree git-local-pull git-write-blob \ git-get-tar-commit-id git-mkdelta git-apply git-stripspace \ - git-cvs2git git-diff-stages + git-cvs2git git-diff-stages git-rev-parse all: $(PROG) @@ -118,6 +118,7 @@ git-mkdelta: mkdelta.c git-stripspace: stripspace.c git-cvs2git: cvs2git.c git-diff-stages: diff-stages.c +git-rev-parse: rev-parse.c git-http-pull: LIBS += -lcurl git-rev-list: LIBS += -lssl diff --git a/rev-parse.c b/rev-parse.c new file mode 100644 index 000000000..69749f5b7 --- /dev/null +++ b/rev-parse.c @@ -0,0 +1,70 @@ +/* + * rev-parse.c + * + * Copyright (C) Linus Torvalds, 2005 + */ +#include "cache.h" + +int main(int argc, char **argv) +{ + int i, as_is = 0; + char *def = NULL; + unsigned char sha1[20]; + + for (i = 1; i < argc; i++) { + char *arg = argv[i]; + char *dotdot; + + if (as_is) { + printf("%s\n", arg); + continue; + } + if (*arg == '-') { + if (!strcmp(arg, "--")) { + if (def) { + printf("%s\n", def); + def = NULL; + } + as_is = 1; + } + if (!strcmp(arg, "--default")) { + if (def) + printf("%s\n", def); + def = argv[i+1]; + i++; + continue; + } + printf("%s\n", arg); + continue; + } + def = NULL; + if (!get_sha1(arg, sha1)) { + printf("%s\n", sha1_to_hex(sha1)); + continue; + } + if (*arg == '^' && !get_sha1(arg+1, sha1)) { + printf("^%s\n", sha1_to_hex(sha1)); + continue; + } + dotdot = strstr(arg, ".."); + if (dotdot) { + unsigned char end[20]; + char *n = dotdot+2; + *dotdot = 0; + if (!get_sha1(arg, sha1)) { + if (!*n) + n = "HEAD"; + if (!get_sha1(n, end)) { + printf("%s\n", sha1_to_hex(end)); + printf("^%s\n", sha1_to_hex(sha1)); + continue; + } + } + *dotdot = '.'; + } + printf("%s\n", arg); + } + if (def) + printf("%s\n", def); + return 0; +} |