cache-tree: retire cache_tree_fully_valid() API function

All callers of this helper use it like so:

    if (!cache_tree_fully_valid(...))
	cache_tree_update(...);

to optimize out the call to cache_tree_update() when the cache-tree
structure is already known to be valid.  However, cache_tree_update()
function itself already has an equivalent check that short-cuts the
recomputation of the tree object name for each subdirectory.

Signed-off-by: Junio C Hamano <[email protected]>

Author: gitster

builtin/checkout.c

@@ -580,8 +580,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 	if (!active_cache_tree)
 		active_cache_tree = cache_tree();
 
-	if (!cache_tree_fully_valid(active_cache_tree))
-		cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
+	cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
 
 	if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
 		die(_("unable to write new index file"));

builtin/commit.c

@@ -405,8 +405,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 	if (!only && !pathspec.nr) {
 		hold_locked_index(&index_lock, 1);
 		refresh_cache_or_die(refresh_flags);
-		if (!cache_tree_fully_valid(active_cache_tree))
-			update_main_cache_tree(WRITE_TREE_SILENT);
+		update_main_cache_tree(WRITE_TREE_SILENT);
 		if (active_cache_changed) {
 			if (write_locked_index(&the_index, &index_lock,
 					       COMMIT_LOCK))

cache-tree.c

@@ -220,20 +220,6 @@ static void discard_unused_subtrees(struct cache_tree *it)
 	}
 }
 
-int cache_tree_fully_valid(struct cache_tree *it)
-{
-	int i;
-	if (!it)
-		return 0;
-	if (it->entry_count < 0 || !has_sha1_file(it->sha1))
-		return 0;
-	for (i = 0; i < it->subtree_nr; i++) {
-		if (!cache_tree_fully_valid(it->down[i]->cache_tree))
-			return 0;
-	}
-	return 1;
-}
-
 static int update_one(struct cache_tree *it,
 		      struct cache_entry **cache,
 		      int entries,
@@ -592,7 +578,7 @@ static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *pat
 
 int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
 {
-	int entries, was_valid, newfd;
+	int entries, newfd;
 	struct lock_file *lock_file;
 
 	/*
@@ -612,21 +598,18 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co
 	if (!index_state->cache_tree)
 		index_state->cache_tree = cache_tree();
 
-	was_valid = cache_tree_fully_valid(index_state->cache_tree);
-	if (!was_valid) {
-		if (cache_tree_update(index_state, flags) < 0)
-			return WRITE_TREE_UNMERGED_INDEX;
-		if (0 <= newfd) {
-			if (!write_locked_index(index_state, lock_file, COMMIT_LOCK))
-				newfd = -1;
-		}
-		/* Not being able to write is fine -- we are only interested
-		 * in updating the cache-tree part, and if the next caller
-		 * ends up using the old index with unupdated cache-tree part
-		 * it misses the work we did here, but that is just a
-		 * performance penalty and not a big deal.
-		 */
+	if (cache_tree_update(index_state, flags) < 0)
+		return WRITE_TREE_UNMERGED_INDEX;
+	if (0 <= newfd) {
+		if (!write_locked_index(index_state, lock_file, COMMIT_LOCK))
+			newfd = -1;
 	}
+	/* Not being able to write is fine -- we are only interested
+	 * in updating the cache-tree part, and if the next caller
+	 * ends up using the old index with unupdated cache-tree part
+	 * it misses the work we did here, but that is just a
+	 * performance penalty and not a big deal.
+	 */
 
 	if (prefix) {
 		struct cache_tree *subtree;

cache-tree.h

@@ -29,7 +29,6 @@ struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
 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 *);
 int cache_tree_update(struct index_state *, int);
 
 int update_main_cache_tree(int);

merge-recursive.c

@@ -265,8 +265,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
 	if (!active_cache_tree)
 		active_cache_tree = cache_tree();
 
-	if (!cache_tree_fully_valid(active_cache_tree) &&
-	    cache_tree_update(&the_index, 0) < 0)
+	if (cache_tree_update(&the_index, 0) < 0)
 		die(_("error building trees"));
 
 	result = lookup_tree(active_cache_tree->sha1);

sequencer.c

@@ -333,9 +333,8 @@ static int is_index_unchanged(void)
 	if (!active_cache_tree)
 		active_cache_tree = cache_tree();
 
-	if (!cache_tree_fully_valid(active_cache_tree))
-		if (cache_tree_update(&the_index, 0))
-			return error(_("Unable to update cache tree\n"));
+	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.oid.hash);
 }

unpack-trees.c

@@ -1244,10 +1244,8 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 		if (!ret) {
 			if (!o->result.cache_tree)
 				o->result.cache_tree = cache_tree();
-			if (!cache_tree_fully_valid(o->result.cache_tree))
-				cache_tree_update(&o->result,
-						  WRITE_TREE_SILENT |
-						  WRITE_TREE_REPAIR);
+			cache_tree_update(&o->result,
+					  WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
 		}
 		discard_index(o->dst_index);
 		*o->dst_index = o->result;