Jonathan Nieder wrote:
[...]
> I still wonder, do we want to pretend we have that object on disk
> and proceed with the commit, or are the hardcoded objects only
> supposed to be sufficient for in-core use?
Sorry, I responded in haste. The objects are supposed to be used in
core and then written out as needed, so I had been describing a bug.
How about this (in the spirit of patch 1/3)? If the approach is
right, I can add tests tomorrow.
-- snipsnip --
Subject: update_one(): write out cached objects as needed
Although we can always pretend to have hardcoded objects such as
the empty tree in core, in the on-disk repository, if they are
referred to, they should be present. Currently, if we try to
write a tree that uses a hardcoded object, we can notice that the
object is missing and fail with "error: invalid object".
With this patch, the objects are written to disk as needed
instead.
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxxxxx>
---
cache-tree.c | 11 +++++++++--
cache.h | 1 +
sha1_file.c | 16 ++++++++++++++++
3 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/cache-tree.c b/cache-tree.c
index 5f8ee87..b17f34f 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -323,8 +323,15 @@ static int update_one(struct cache_tree *it,
mode = ce->ce_mode;
entlen = pathlen - baselen;
}
- if (mode != S_IFGITLINK && !missing_ok && !has_sha1_file(sha1))
- return error("invalid object %s", sha1_to_hex(sha1));
+ if (mode != S_IFGITLINK && !missing_ok &&
+ !has_sha1_file(sha1)) {
+ /* Hopefully it's a cached object. Make sure. */
+ if (dryrun)
+ (void) sha1_object_info(sha1, NULL);
+ else if (write_cached_object_sha1_file(sha1))
+ return error("invalid object %s",
+ sha1_to_hex(sha1));
+ }
if (ce->ce_flags & CE_REMOVE)
continue; /* entry being removed */
diff --git a/cache.h b/cache.h
index c443df4..83dbdf7 100644
--- a/cache.h
+++ b/cache.h
@@ -546,6 +546,7 @@ extern int hash_sha1_file(const void *buf, unsigned long len, const char *type,
extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
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 write_cached_object_sha1_file(const unsigned char *sha1);
/* just like read_sha1_file(), but non fatal in presence of bad objects */
extern void *read_object(const unsigned char *sha1, enum object_type *type, unsigned long *size);
diff --git a/sha1_file.c b/sha1_file.c
index 7d86d76..8584a33 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2028,6 +2028,22 @@ static struct cached_object *find_cached_object(const unsigned char *sha1)
return NULL;
}
+int write_cached_object_sha1_file(const unsigned char *sha1)
+{
+ struct cached_object *co = find_cached_object(sha1);
+ unsigned char sha1_compare[20];
+ int result;
+
+ if (co == NULL)
+ return -1;
+ result = write_sha1_file(co->buf, co->size, typename(co->type),
+ sha1_compare);
+ if (memcmp(sha1, sha1_compare, 20))
+ return error("corrupt cached object %s",
+ sha1_to_hex(sha1));
+ return result;
+}
+
int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
unsigned char *sha1)
{
--
1.6.0.481.gabe4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
