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>
int entries,
const char *base,
int baselen,
int entries,
const char *base,
int baselen,
+ int missing_ok,
+ int dryrun)
{
unsigned long size, offset;
char *buffer;
{
unsigned long size, offset;
char *buffer;
cache + i, entries - i,
path,
baselen + sublen + 1,
cache + i, entries - i,
path,
baselen + sublen + 1,
i += subcnt - 1;
sub->used = 1;
}
i += subcnt - 1;
sub->used = 1;
}
- 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
free(buffer);
it->entry_count = i;
#if DEBUG
int cache_tree_update(struct cache_tree *it,
struct cache_entry **cache,
int entries,
int cache_tree_update(struct cache_tree *it,
struct cache_entry **cache,
int entries,
+ int missing_ok,
+ int dryrun)
{
int i;
i = verify_cache(cache, entries);
if (i)
return i;
{
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;
if (i < 0)
return i;
return 0;
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
int cache_tree_fully_valid(struct cache_tree *);
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 cache_tree *, struct cache_entry **, int, int);
+int cache_tree_update(struct cache_tree *, struct cache_entry **, int, int, int);
if (!was_valid) {
if (cache_tree_update(active_cache_tree,
active_cache, active_nr,
if (!was_valid) {
if (cache_tree_update(active_cache_tree,
active_cache, active_nr,
die("git-write-tree: error building trees");
if (0 <= newfd) {
if (!write_cache(newfd, active_cache, active_nr))
die("git-write-tree: error building trees");
if (0 <= newfd) {
if (!write_cache(newfd, active_cache, active_nr))