[PATCH 4/4] builtin-gc.c: use new pack_keep bitfield to detect .keep file existence

From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Nov 7, 2008, 01:56 UTC
Message-ID: <3ViIDELaxoBUGtbz27ICr9Qm3avB1LFH5UHtBEWeFrLNfT2qnYqDyA@cipher.nrlssc.navy.mil>
In-Reply-To: <-NKrpBlnD0U49OczAyUd7HiIBqhMblkOkU4lOc2bc9qfTrGNrwpLTg@cipher.nrlssc.navy.mil>

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
---

I think the existing code was broken. Looks like it would only skip counting a pack if the pack disappeared between the prepare_packed_git() and the access() call. It never used the path it create with the .keep extension.

-brandon

 builtin-gc.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/builtin-gc.c b/builtin-gc.c
index 7af65bb..781df60 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -131,19 +131,9 @@ static int too_many_packs(void)
 
 	prepare_packed_git();
 	for (cnt = 0, p = packed_git; p; p = p->next) {
-		char path[PATH_MAX];
-		size_t len;
-		int keep;
-
 		if (!p->pack_local)
 			continue;
-		len = strlen(p->pack_name);
-		if (PATH_MAX <= len + 1)
-			continue; /* oops, give up */
-		memcpy(path, p->pack_name, len-5);
-		memcpy(path + len - 5, ".keep", 6);
-		keep = access(p->pack_name, F_OK) && (errno == ENOENT);
-		if (keep)
+		if (p->pack_keep)
 			continue;
 		/*
 		 * Perhaps check the size of the pack and count only

-- 
1.6.0.3.552.g12334