summaryrefslogtreecommitdiff
path: root/cat-file.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2005-12-04 01:57:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-04 07:07:17 (GMT)
commit7950571ad75c1c97e5e53626d8342b01b167c790 (patch)
tree02a67856e4edb0254fbaa229feec55221573822a /cat-file.c
parente40b61fb6bd2e0ed2dc4799096fcf4c828c28d6d (diff)
downloadgit-7950571ad75c1c97e5e53626d8342b01b167c790.zip
git-7950571ad75c1c97e5e53626d8342b01b167c790.tar.gz
git-7950571ad75c1c97e5e53626d8342b01b167c790.tar.bz2
A few more options for git-cat-file
This adds '-e' option to git-cat-file, to test for the existence of the object. This also cleans up the option-parsing in git-cat-file slightly. [jc: HPA version had -n option which did rev-parse --verify; the real value of this patch is the option parsing cleanup.] Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cat-file.c')
-rw-r--r--cat-file.c47
1 files changed, 32 insertions, 15 deletions
diff --git a/cat-file.c b/cat-file.c
index d775a15..7594108 100644
--- a/cat-file.c
+++ b/cat-file.c
@@ -11,27 +11,44 @@ int main(int argc, char **argv)
char type[20];
void *buf;
unsigned long size;
+ int opt;
setup_git_directory();
if (argc != 3 || get_sha1(argv[2], sha1))
- usage("git-cat-file [-t | -s | <type>] <sha1>");
-
- if (!strcmp("-t", argv[1]) || !strcmp("-s", argv[1])) {
- if (!sha1_object_info(sha1, type,
- argv[1][1] == 's' ? &size : NULL)) {
- switch (argv[1][1]) {
- case 't':
- printf("%s\n", type);
- break;
- case 's':
- printf("%lu\n", size);
- break;
- }
+ usage("git-cat-file [-t|-s|-e|<type>] <sha1>");
+
+ opt = 0;
+ if ( argv[1][0] == '-' ) {
+ opt = argv[1][1];
+ if ( !opt || argv[1][2] )
+ opt = -1; /* Not a single character option */
+ }
+
+ buf = NULL;
+ switch (opt) {
+ case 't':
+ if (!sha1_object_info(sha1, type, NULL)) {
+ printf("%s\n", type);
return 0;
}
- buf = NULL;
- } else {
+ break;
+
+ case 's':
+ if (!sha1_object_info(sha1, type, &size)) {
+ printf("%lu\n", size);
+ return 0;
+ }
+ break;
+
+ case 'e':
+ return !has_sha1_file(sha1);
+
+ case 0:
buf = read_object_with_reference(sha1, argv[1], &size, NULL);
+ break;
+
+ default:
+ die("git-cat-file: unknown option: %s\n", argv[1]);
}
if (!buf)