[PATCH] git-merge-cache -q doesn't complain about failing merge program

[git.git] / rev-cache.c

diff --git a/rev-cache.c b/rev-cache.c
index ea65274..6344d62 100644 (file)
--- a/rev-cache.c
+++ b/rev-cache.c
@@ -5,7 +5,7 @@
 struct rev_cache **rev_cache;
 int nr_revs, alloc_revs;
 
-struct rev_list_elem *rle_free;
+static struct rev_list_elem *rle_free;
 
 #define BATCH_SIZE 512
 
@@ -212,11 +212,9 @@ int read_rev_cache(const char *path, FILE *dumpfile, int dry_run)
                return -1;
        }
        map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
-       if (map == MAP_FAILED) {
-               close(fd);
-               return -1;
-       }
        close(fd);
+       if (map == MAP_FAILED)
+               return -1;
 
        memset(last_sha1, 0, 20);
        ofs = 0;