[PATCH] Really fix git-merge-one-file-script this time.

diff --git a/rev-tree.c b/rev-tree.c
index c3884e3595cd00f8c1108429060ed195f7506514..95ec274fc7fa68d2e70446104c51732ac7815fe2 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"
 
@@ -55,6 +50,10 @@ void process_commit(unsigned char *sha1)
 {
        struct commit_list *parents;
        struct commit *obj = lookup_commit(sha1);
+
+       if (obj->object.parsed)
+               return;
+
        parse_commit(obj);
        
        parents = obj->parents;
@@ -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;
                }