X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rev-tree.c;h=c2909da1722b48be394311d9cc70cf78ec81e411;hb=902b92e00e491a60d55c4b2bce122903b8347f34;hp=c3884e3595cd00f8c1108429060ed195f7506514;hpb=5873b67eef184d771359c187889c6e5c412b9d43;p=git.git

diff --git a/rev-tree.c b/rev-tree.c
index c3884e359..c2909da17 100644
--- a/rev-tree.c
+++ b/rev-tree.c
@@ -1,8 +1,3 @@
-#define _XOPEN_SOURCE /* glibc2 needs this */
-#define _BSD_SOURCE /* for tm.tm_gmtoff */
-#include <time.h>
-#include <ctype.h>
-
 #include "cache.h"
 #include "commit.h"
 
@@ -55,8 +50,12 @@ void process_commit(unsigned char *sha1)
 {
 	struct commit_list *parents;
 	struct commit *obj = lookup_commit(sha1);
-	parse_commit(obj);
-	
+
+	if (obj && obj->object.parsed)
+		return;
+	if (!obj || parse_commit(obj))
+		die("unable to parse commit (%s)", sha1_to_hex(sha1));
+
 	parents = obj->parents;
 	while (parents) {
 		process_commit(parents->item->object.sha1);
@@ -85,8 +84,7 @@ int main(int argc, char **argv)
 		char *arg = argv[i];
 
 		if (!strcmp(arg, "--cache")) {
-			read_cache_file(argv[2]);
-			i++;
+			read_cache_file(argv[++i]);
 			continue;
 		}
 
@@ -99,7 +97,7 @@ int main(int argc, char **argv)
 			arg++;
 			basemask |= 1<<nr;
 		}
-		if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))
+		if (nr >= MAX_COMMITS || get_sha1(arg, sha1[nr]))
 			usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
 		process_commit(sha1[nr]);
 		nr++;