cache-tree: mark istate->cache_changed on cache tree update

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache-tree.c b/cache-tree.c
index 23ddc73720490fd400cc4dd7ff2456ae1305b456..18055f1c9600b8c8d2b5af0556d077f05452b3f8 100644 (file)
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -151,7 +151,7 @@ void cache_tree_invalidate_path(struct index_state *istate, const char *path)
                istate->cache_changed |= CACHE_TREE_CHANGED;
 }
 
                istate->cache_changed |= CACHE_TREE_CHANGED;
 }
 

-static int verify_cache(const struct cache_entry * const *cache,
+static int verify_cache(struct cache_entry **cache,

                        int entries, int flags)
 {
        int i, funny;
                        int entries, int flags)
 {
        int i, funny;


@@ -236,7 +236,7 @@ int cache_tree_fully_valid(struct cache_tree *it)
 }
 
 static int update_one(struct cache_tree *it,
 }
 
 static int update_one(struct cache_tree *it,

-                     const struct cache_entry * const *cache,
+                     struct cache_entry **cache,

                      int entries,
                      const char *base,
                      int baselen,
                      int entries,
                      const char *base,
                      int baselen,


@@ -398,18 +398,19 @@ static int update_one(struct cache_tree *it,
        return i;
 }
 
        return i;
 }
 

-int cache_tree_update(struct cache_tree *it,
-                     const struct cache_entry * const *cache,
-                     int entries,
-                     int flags)
+int cache_tree_update(struct index_state *istate, int flags)

 {
 {

-       int i, skip;
-       i = verify_cache(cache, entries, flags);
+       struct cache_tree *it = istate->cache_tree;
+       struct cache_entry **cache = istate->cache;
+       int entries = istate->cache_nr;
+       int skip, i = verify_cache(cache, entries, flags);
+

        if (i)
                return i;
        i = update_one(it, cache, entries, "", 0, &skip, flags);
        if (i < 0)
                return i;
        if (i)
                return i;
        i = update_one(it, cache, entries, "", 0, &skip, flags);
        if (i < 0)
                return i;

+       istate->cache_changed |= CACHE_TREE_CHANGED;

        return 0;
 }
 
        return 0;
 }
 


@@ -597,9 +598,7 @@ int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
 
        was_valid = cache_tree_fully_valid(active_cache_tree);
        if (!was_valid) {
 
        was_valid = cache_tree_fully_valid(active_cache_tree);
        if (!was_valid) {

-               if (cache_tree_update(active_cache_tree,
-                                     (const struct cache_entry * const *)active_cache,
-                                     active_nr, flags) < 0)
+               if (cache_tree_update(&the_index, flags) < 0)

                        return WRITE_TREE_UNMERGED_INDEX;
                if (0 <= newfd) {
                        if (!write_locked_index(&the_index, lock_file, COMMIT_LOCK))
                        return WRITE_TREE_UNMERGED_INDEX;
                if (0 <= newfd) {
                        if (!write_locked_index(&the_index, lock_file, COMMIT_LOCK))


@@ -698,7 +697,5 @@ int update_main_cache_tree(int flags)
 {
        if (!the_index.cache_tree)
                the_index.cache_tree = cache_tree();
 {
        if (!the_index.cache_tree)
                the_index.cache_tree = cache_tree();

-       return cache_tree_update(the_index.cache_tree,
-                                (const struct cache_entry * const *)the_index.cache,
-                                the_index.cache_nr, flags);
+       return cache_tree_update(&the_index, flags);

 }
 }

diff --git a/cache-tree.h b/cache-tree.h
index dfbcfabf115fb3e42bde74d185e67130fabf30f0..154b357f914b576b3a38933ed31b2bc1b3999f90 100644 (file)
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -30,7 +30,7 @@ void cache_tree_write(struct strbuf *, struct cache_tree *root);
 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
 
 int cache_tree_fully_valid(struct cache_tree *);
 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
 
 int cache_tree_fully_valid(struct cache_tree *);

-int cache_tree_update(struct cache_tree *, const struct cache_entry * const *, int, int);
+int cache_tree_update(struct index_state *, int);

 
 int update_main_cache_tree(int);
 
 
 int update_main_cache_tree(int);
 

diff --git a/merge-recursive.c b/merge-recursive.c
index 442c1ec0f492a5a0bede39687b97021978a5550a..0b5d34d0b2c2adcf2c45a88be46c29955ad221e1 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -265,9 +265,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
                active_cache_tree = cache_tree();
 
        if (!cache_tree_fully_valid(active_cache_tree) &&
                active_cache_tree = cache_tree();
 
        if (!cache_tree_fully_valid(active_cache_tree) &&

-           cache_tree_update(active_cache_tree,
-                             (const struct cache_entry * const *)active_cache,
-                             active_nr, 0) < 0)
+           cache_tree_update(&the_index, 0) < 0)

                die(_("error building trees"));
 
        result = lookup_tree(active_cache_tree->sha1);
                die(_("error building trees"));
 
        result = lookup_tree(active_cache_tree->sha1);

diff --git a/sequencer.c b/sequencer.c
index 5ebc461a9b4f131001b186736d94cd52654ce5ce..4b709dba5f2e427afa87bc1b2e1f16e32f946c87 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -371,9 +371,7 @@ static int is_index_unchanged(void)
                active_cache_tree = cache_tree();
 
        if (!cache_tree_fully_valid(active_cache_tree))
                active_cache_tree = cache_tree();
 
        if (!cache_tree_fully_valid(active_cache_tree))

-               if (cache_tree_update(active_cache_tree,
-                                     (const struct cache_entry * const *)active_cache,
-                                     active_nr, 0))
+               if (cache_tree_update(&the_index, 0))

                        return error(_("Unable to update cache tree\n"));
 
        return !hashcmp(active_cache_tree->sha1, head_commit->tree->object.sha1);
                        return error(_("Unable to update cache tree\n"));
 
        return !hashcmp(active_cache_tree->sha1, head_commit->tree->object.sha1);

diff --git a/test-dump-cache-tree.c b/test-dump-cache-tree.c
index 47eab9765f5cd172ca630b2a632a92d123354442..330ba4f4dd23e2cf21acbe8a7023eaca4ec09afe 100644 (file)
--- a/test-dump-cache-tree.c
+++ b/test-dump-cache-tree.c
@@ -56,11 +56,12 @@ static int dump_cache_tree(struct cache_tree *it,
 
 int main(int ac, char **av)
 {
 
 int main(int ac, char **av)
 {

+       struct index_state istate;

        struct cache_tree *another = cache_tree();
        if (read_cache() < 0)
                die("unable to read index file");
        struct cache_tree *another = cache_tree();
        if (read_cache() < 0)
                die("unable to read index file");

-       cache_tree_update(another,
-                         (const struct cache_entry * const *)active_cache,
-                         active_nr, WRITE_TREE_DRY_RUN);
+       istate = the_index;
+       istate.cache_tree = another;
+       cache_tree_update(&istate, WRITE_TREE_DRY_RUN);

        return dump_cache_tree(active_cache_tree, another, "");
 }
        return dump_cache_tree(active_cache_tree, another, "");
 }