Rename cache_match_stat() to ce_match_stat()

diff --git a/rev-tree.c b/rev-tree.c
index ebeceb070b72744b47873c0a562d3ec692269a96..c2909da1722b48be394311d9cc70cf78ec81e411 100644 (file)
--- 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"
 
@@ -56,11 +51,11 @@ 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);
@@ -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,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++;