diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-27 16:21:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-27 16:21:54 -0700 |
| commit | 2956dd3bd7bd512aa8fce7e55d5eec1e56df99ab (patch) | |
| tree | f3f43e014fa8a1c0ee5829eec216e85b831f15a3 /cache-tree.c | |
| parent | read-tree: teach 1-way merege and plain read to prime cache-tree. (diff) | |
| download | tgif-2956dd3bd7bd512aa8fce7e55d5eec1e56df99ab.tar.xz | |
cache_tree_update: give an option to update cache-tree only.
When the extra "dryrun" parameter is true, cache_tree_update()
recomputes the invalid entry but does not actually creates
new tree object.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/cache-tree.c b/cache-tree.c index 35740b3647..a10902fd30 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -226,7 +226,8 @@ static int update_one(struct cache_tree *it, int entries, const char *base, int baselen, - int missing_ok) + int missing_ok, + int dryrun) { unsigned long size, offset; char *buffer; @@ -273,7 +274,8 @@ static int update_one(struct cache_tree *it, cache + i, entries - i, path, baselen + sublen + 1, - missing_ok); + missing_ok, + dryrun); i += subcnt - 1; sub->used = 1; } @@ -338,7 +340,14 @@ static int update_one(struct cache_tree *it, #endif } - write_sha1_file(buffer, offset, tree_type, it->sha1); + if (dryrun) { + char hdr[200]; + int hdrlen; + write_sha1_file_prepare(buffer, offset, tree_type, it->sha1, + hdr, &hdrlen); + } + else + write_sha1_file(buffer, offset, tree_type, it->sha1); free(buffer); it->entry_count = i; #if DEBUG @@ -352,13 +361,14 @@ static int update_one(struct cache_tree *it, int cache_tree_update(struct cache_tree *it, struct cache_entry **cache, int entries, - int missing_ok) + int missing_ok, + int dryrun) { int i; i = verify_cache(cache, entries); if (i) return i; - i = update_one(it, cache, entries, "", 0, missing_ok); + i = update_one(it, cache, entries, "", 0, missing_ok, dryrun); if (i < 0) return i; return 0; |