Merge branch 'jc/cache-tree-wip' into pu

* jc/cache-tree-wip:
  cache-tree: freshen the tree object at the top level
  cache-tree: retire cache_tree_fully_valid() API function
  commit: remove redundant check for active_cache_changed
  freshen_object(): factor out a helper function

Author: gitster

builtin/checkout.c

@@ -581,8 +581,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

@@ -418,9 +418,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 (active_cache_changed
-		    || !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,
@@ -246,14 +232,17 @@ static int update_one(struct cache_tree *it,
 	int missing_ok = flags & WRITE_TREE_MISSING_OK;
 	int dryrun = flags & WRITE_TREE_DRY_RUN;
 	int repair = flags & WRITE_TREE_REPAIR;
+	int toplevel = flags & WRITE_TREE_TOPLEVEL;
 	int to_invalidate = 0;
 	int i;
 
 	assert(!(dryrun && repair));
 
+	flags &= ~WRITE_TREE_TOPLEVEL;
 	*skip_count = 0;
 
-	if (0 <= it->entry_count && has_sha1_file(it->sha1))
+	if (0 <= it->entry_count &&
+	    (toplevel ? freshen_object : has_sha1_file)(it->sha1))
 		return it->entry_count;
 
 	/*
@@ -431,7 +420,8 @@ int cache_tree_update(struct index_state *istate, int flags)
 
 	if (i)
 		return i;
-	i = update_one(it, cache, entries, "", 0, &skip, flags);
+	i = update_one(it, cache, entries, "", 0, &skip,
+		       flags | WRITE_TREE_TOPLEVEL);
 	if (i < 0)
 		return i;
 	istate->cache_changed |= CACHE_TREE_CHANGED;
@@ -600,7 +590,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;
 
 	/*
@@ -620,21 +610,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);
@@ -40,6 +39,7 @@ int update_main_cache_tree(int);
 #define WRITE_TREE_DRY_RUN 4
 #define WRITE_TREE_SILENT 8
 #define WRITE_TREE_REPAIR 16
+#define WRITE_TREE_TOPLEVEL 32
 
 /* error return codes */
 #define WRITE_TREE_UNREADABLE_INDEX (-1)

cache.h

@@ -1126,6 +1126,7 @@ extern int sha1_object_info(const unsigned char *, unsigned long *);
 extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
 extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
 extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags);
+extern int freshen_object(const unsigned char *);
 extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
 extern int force_object_loose(const unsigned char *sha1, time_t mtime);
 extern int git_open_cloexec(const char *name, int flags);

merge-recursive.c

@@ -298,8 +298,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) {
 		err(o, _("error building trees"));
 		return NULL;
 	}

sequencer.c

@@ -386,9 +386,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);
 }

sha1_file.c

@@ -3275,6 +3275,11 @@ static int freshen_packed_object(const unsigned char *sha1)
 	return 1;
 }
 
+int freshen_object(const unsigned char *sha1)
+{
+	return freshen_packed_object(sha1) || freshen_loose_object(sha1);
+}
+
 int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1)
 {
 	char hdr[32];
@@ -3284,7 +3289,7 @@ int write_sha1_file(const void *buf, unsigned long len, const char *type, unsign
 	 * it out into .git/objects/??/?{38} file.
 	 */
 	write_sha1_file_prepare(buf, len, type, sha1, hdr, &hdrlen);
-	if (freshen_packed_object(sha1) || freshen_loose_object(sha1))
+	if (freshen_object(sha1))
 		return 0;
 	return write_loose_object(sha1, hdr, hdrlen, buf, len, 0);
 }
@@ -3302,7 +3307,7 @@ int hash_sha1_file_literally(const void *buf, unsigned long len, const char *typ
 
 	if (!(flags & HASH_WRITE_OBJECT))
 		goto cleanup;
-	if (freshen_packed_object(sha1) || freshen_loose_object(sha1))
+	if (freshen_object(sha1))
 		goto cleanup;
 	status = write_loose_object(sha1, header, hdrlen, buf, len, 0);
 

unpack-trees.c

@@ -1243,10 +1243,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;