From 7950571ad75c1c97e5e53626d8342b01b167c790 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sat, 3 Dec 2005 17:57:48 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- cat-file.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) (limited to 'cat-file.c') diff --git a/cat-file.c b/cat-file.c index d775a1545b..7594108c6e 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 | ] "); - - 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|] "); + + 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) -- cgit v1.2.1