From f3f043a103b7a7da57272ecf3252bda6089e41ae Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 12 Nov 2018 09:49:35 -0500 Subject: handle alternates paths the same as the main object dir When we generate loose file paths for the main object directory, the caller provides a buffer to loose_object_path (formerly sha1_file_name). The callers generally keep their own static buffer to avoid excessive reallocations. But for alternate directories, each struct carries its own scratch buffer. This is needlessly different; let's unify them. We could go either direction here, but this patch moves the alternates struct over to the main directory style (rather than vice-versa). Technically the alternates style is more efficient, as it avoids rewriting the object directory name on each call. But this is unlikely to matter in practice, as we avoid reallocations either way (and nobody has ever noticed or complained that the main object directory is copying a few extra bytes before making a much more expensive system call). And this has the advantage that the reusable buffers are tied to particular calls, which makes the invalidation rules simpler (for example, the return value from stat_sha1_file() used to be invalidated by basically any other object call, but now it is affected only by other calls to stat_sha1_file()). We do steal the trick from alt_sha1_path() of returning a pointer to the filled buffer, which makes a few conversions more convenient. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- object.c | 1 - 1 file changed, 1 deletion(-) (limited to 'object.c') diff --git a/object.c b/object.c index 6af8e908bb..dd485ac629 100644 --- a/object.c +++ b/object.c @@ -484,7 +484,6 @@ struct raw_object_store *raw_object_store_new(void) static void free_alt_odb(struct object_directory *odb) { - strbuf_release(&odb->scratch); oid_array_clear(&odb->loose_objects_cache); free(odb); } -- cgit v1.2.3