@matheusbsbs / matheus-bagliano / commits / 2956dd3bd7
Fork 0

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>

Junio C Hamano committed Apr 27, 2006 at 16:21 UTC 2956dd3bd7bd512aa8fce7e55d5eec1e56df99ab
3 files changed +17 -7
cache-tree.c
+15 -5
@@ -226,7 +226,8 @@ static int update_one(struct cache_tree *it,
226 int entries,
227 const char *base,
228 int baselen,
229 - int missing_ok)
229 + int missing_ok,
230 + int dryrun)
231 {
232 unsigned long size, offset;
233 char *buffer;
@@ -273,7 +274,8 @@ static int update_one(struct cache_tree *it,
274 cache + i, entries - i,
275 path,
276 baselen + sublen + 1,
276 - missing_ok);
277 + missing_ok,
278 + dryrun);
279 i += subcnt - 1;
280 sub->used = 1;
281 }
@@ -338,7 +340,14 @@ static int update_one(struct cache_tree *it,
340 #endif
341 }
342
341 - write_sha1_file(buffer, offset, tree_type, it->sha1);
343 + if (dryrun) {
344 + char hdr[200];
345 + int hdrlen;
346 + write_sha1_file_prepare(buffer, offset, tree_type, it->sha1,
347 + hdr, &hdrlen);
348 + }
349 + else
350 + write_sha1_file(buffer, offset, tree_type, it->sha1);
351 free(buffer);
352 it->entry_count = i;
353 #if DEBUG
@@ -352,13 +361,14 @@ static int update_one(struct cache_tree *it,
361 int cache_tree_update(struct cache_tree *it,
362 struct cache_entry **cache,
363 int entries,
355 - int missing_ok)
364 + int missing_ok,
365 + int dryrun)
366 {
367 int i;
368 i = verify_cache(cache, entries);
369 if (i)
370 return i;
361 - i = update_one(it, cache, entries, "", 0, missing_ok);
371 + i = update_one(it, cache, entries, "", 0, missing_ok, dryrun);
372 if (i < 0)
373 return i;
374 return 0;
cache-tree.h
+1 -1
@@ -26,6 +26,6 @@ void *cache_tree_write(struct cache_tree *root, unsigned long *size_p);
26 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
27
28 int cache_tree_fully_valid(struct cache_tree *);
29 -int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int);
29 +int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int);
30
31 #endif
write-tree.c
+1 -1
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
41 if (!was_valid) {
42 if (cache_tree_update(active_cache_tree,
43 active_cache, active_nr,
44 - missing_ok) < 0)
44 + missing_ok, 0) < 0)
45 die("git-write-tree: error building trees");
46 if (0 <= newfd) {
47 if (!write_cache(newfd, active_cache, active_nr))