X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=rev-tree.c;h=bc190ebc71bbd923f2b728e505408f5e54bd073a;hb=d6db01075b65da2b8584a0450619390893aae103;hp=ebeceb070b72744b47873c0a562d3ec692269a96;hpb=3b7d368f34715003c834233d9f23456bcb62b44a;p=git.git

diff --git a/rev-tree.c b/rev-tree.c
index ebeceb07..bc190ebc 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"
 
@@ -51,16 +46,16 @@ static int interesting(struct commit *rev)
 	return 1;
 }
 
-void process_commit(unsigned char *sha1)
+static void process_commit(unsigned char *sha1)
 {
 	struct commit_list *parents;
 	struct commit *obj = lookup_commit(sha1);
 
-	if (obj->object.parsed)
+	if (obj && obj->object.parsed)
 		return;
+	if (!obj || parse_commit(obj))
+		die("unable to parse commit (%s)", sha1_to_hex(sha1));
 
-	parse_commit(obj);
-	
 	parents = obj->parents;
 	while (parents) {
 		process_commit(parents->item->object.sha1);
@@ -69,7 +64,7 @@ void process_commit(unsigned char *sha1)
 }
 
 /*
- * Usage: rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
+ * Usage: git-rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id2>]
  *
  * The cache-file can be quite important for big trees. This is an
  * expensive operation if you have to walk the whole chain of
@@ -89,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;
 		}
 
@@ -103,8 +97,8 @@ int main(int argc, char **argv)
 			arg++;
 			basemask |= 1<<nr;
 		}
-		if (nr >= MAX_COMMITS || get_sha1_hex(arg, sha1[nr]))
-			usage("rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
+		if (nr >= MAX_COMMITS || get_sha1(arg, sha1[nr]))
+			usage("git-rev-tree [--edges] [--cache <cache-file>] <commit-id> [<commit-id>]");
 		process_commit(sha1[nr]);
 		nr++;
 	}