summaryrefslogtreecommitdiff
path: root/test-dump-cache-tree.c
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2011-12-06 18:43:37 +0100
committerJunio C Hamano <gitster@pobox.com>2011-12-06 14:57:36 -0800
commit996277c520641d650dc15ad751cc4ad33318e298 (patch)
tree53ba60089bcd1c336438f7ac7d5f2d124029fece /test-dump-cache-tree.c
parent4eb0346fb8f8a59a1fb7a6bd01154655a7020087 (diff)
downloadgit-996277c520641d650dc15ad751cc4ad33318e298.tar.gz
Refactor cache_tree_update idiom from commit
We'll need to safely create or update the cache-tree data of the_index from other places. While at it, give it an argument that lets us silence the messages produced by unmerged entries (which prevent it from working). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'test-dump-cache-tree.c')
-rw-r--r--test-dump-cache-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/test-dump-cache-tree.c b/test-dump-cache-tree.c
index 1f73f1ea7d..e6c292385f 100644
--- a/test-dump-cache-tree.c
+++ b/test-dump-cache-tree.c
@@ -59,6 +59,6 @@ int main(int ac, char **av)
struct cache_tree *another = cache_tree();
if (read_cache() < 0)
die("unable to read index file");
- cache_tree_update(another, active_cache, active_nr, 0, 1);
+ cache_tree_update(another, active_cache, active_nr, 0, 1, 0);
return dump_cache_tree(active_cache_tree, another, "");
}