Merge branch 'jc/grep' into next

diff --git a/update-index.c b/update-index.c
index ea1a3770573dd00654ea6c7d00ae8b5d7a9387f8..061b18c1a568539cbaf2dae3e80c479fe06df2d8 100644 (file)
--- a/update-index.c
+++ b/update-index.c
@@ -6,12 +6,8 @@
 #include "cache.h"
 #include "strbuf.h"
 #include "quote.h"
-#include "tree-walk.h"
-#include "tree.h"
 #include "cache-tree.h"
-
-static unsigned char active_cache_sha1[20];
-static struct cache_tree *active_cache_tree;
+#include "tree-walk.h"
 
 /*
  * Default to not allowing changes to the list of files. The
@@ -489,7 +485,7 @@ static void read_index_info(int line_termination)
 }
 
 static const char update_index_usage[] =
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--ignore-missing] [-z] [--verbose] [--] <file>...";
 
 static unsigned char head_sha1[20];
 static unsigned char merge_head_sha1[20];
@@ -625,10 +621,9 @@ int main(int argc, const char **argv)
        if (newfd < 0)
                die("unable to create new cachefile");
 
-       entries = read_cache_1(active_cache_sha1);
+       entries = read_cache();
        if (entries < 0)
                die("cache corrupted");
-       active_cache_tree = read_cache_tree(active_cache_sha1);
 
        for (i = 1 ; i < argc; i++) {
                const char *path = argv[i];
@@ -767,11 +762,9 @@ int main(int argc, const char **argv)
 
  finish:
        if (active_cache_changed) {
-               if (write_cache_1(newfd, active_cache, active_nr,
-                                 active_cache_sha1) ||
+               if (write_cache(newfd, active_cache, active_nr) ||
                    commit_index_file(&cache_file))
                        die("Unable to write new cachefile");
-               write_cache_tree(active_cache_sha1, active_cache_tree);
        }
 
        return has_errors ? 1 : 0;