From: Brandon Casey <casey@nrlssc.navy.mil>
Date: Wed, 12 Nov 2008 17:59:07 +0000 (-0600)
Subject: builtin-gc.c: use new pack_keep bitfield to detect .keep file existence
X-Git-Tag: v1.6.1-rc1~41^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=01af249fa15ce63ea69e89e3520022420ecb409c;p=git.git

builtin-gc.c: use new pack_keep bitfield to detect .keep file existence

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-gc.c b/builtin-gc.c
index fac200e0b..53a0d43b6 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -134,19 +134,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