All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 1/2] pack-refs: remove all empty directories under $GIT_DIR/refs
Date: Sat, 11 Feb 2012 14:55:06 +0700	[thread overview]
Message-ID: <1328946907-31650-1-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1328891127-17150-1-git-send-email-pclouds@gmail.com>

Deleting refs does not remove parent directories if they are empty.
Empty directories add extra overhead to startup time of most of git
commands because they have to traverse $GIT_DIR/refs.

Some directories are kept by this patch even if they are empty (refs,
refs/heads and refs/tags). The first one is one of git repository
signature. The rest is created by init-db, one may expect them to always
be there.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 v2, no more refs code change.

 Part of the reason I do not want to update delete_ref() is because it
 won't remove empty directories in existing repositories.

 pack-refs.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/pack-refs.c b/pack-refs.c
index f09a054..bb3a9c4 100644
--- a/pack-refs.c
+++ b/pack-refs.c
@@ -91,6 +91,58 @@ static void try_remove_empty_parents(char *name)
 	}
 }
 
+static int prune_empty_dirs(const char *path)
+{
+	int nr_entries = 0, pathlen = strlen(path);
+	DIR *dir;
+	struct dirent *de;
+	char *subpath;
+
+	dir = opendir(git_path("%s", path));
+
+	if (!dir)
+		return 0;
+
+	subpath = xmalloc(pathlen + 257);
+	memcpy(subpath, path, pathlen);
+	if (pathlen && path[pathlen-1] != '/')
+		subpath[pathlen++] = '/';
+
+	while ((de = readdir(dir)) != NULL) {
+		struct stat st;
+		int namelen;
+
+		if (de->d_name[0] == '.') {
+			if (strcmp(de->d_name, "..") && strcmp(de->d_name, "."))
+				nr_entries++;
+			continue;
+		}
+		nr_entries++;
+		namelen = strlen(de->d_name);
+		if (namelen > 255)
+			continue;
+		if (has_extension(de->d_name, ".lock"))
+			continue;
+		memcpy(subpath + pathlen, de->d_name, namelen+1);
+		if (stat(git_path("%s", subpath), &st) < 0)
+			continue;
+		if (S_ISDIR(st.st_mode)) {
+			int removed = prune_empty_dirs(subpath);
+			if (removed)
+				nr_entries--;
+			continue;
+		}
+	}
+	free(subpath);
+	closedir(dir);
+	if (nr_entries == 0 &&
+	    strcmp(path, "refs") &&
+	    strcmp(path, "refs/heads") &&
+	    strcmp(path, "refs/tags"))
+		return rmdir(git_path("%s", path)) == 0;
+	return 0;
+}
+
 /* make sure nobody touched the ref, and unlink */
 static void prune_ref(struct ref_to_prune *r)
 {
@@ -109,6 +161,7 @@ static void prune_refs(struct ref_to_prune *r)
 		prune_ref(r);
 		r = r->next;
 	}
+	prune_empty_dirs("refs");
 }
 
 static struct lock_file packed;
-- 
1.7.8.36.g69ee2

  parent reply	other threads:[~2012-02-11  7:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-10 16:25 [PATCH] Remove empty ref directories while reading loose refs Nguyễn Thái Ngọc Duy
2012-02-10 19:09 ` Junio C Hamano
2012-02-10 20:53 ` Jeff King
2012-02-11  7:55 ` Nguyễn Thái Ngọc Duy [this message]
2012-02-11  7:55   ` [PATCH 2/2] Revert be7c6d4 (pack-refs: remove newly empty directories) Nguyễn Thái Ngọc Duy
2012-02-11  8:26   ` [PATCH 1/2] pack-refs: remove all empty directories under $GIT_DIR/refs Junio C Hamano
2012-02-11  8:55     ` Nguyen Thai Ngoc Duy
2012-02-11 17:59       ` Junio C Hamano
2012-02-11 11:08   ` [PATCH] pack-refs: remove all empty dirs under .git/{refs,logs/refs} Nguyễn Thái Ngọc Duy
2012-02-11 11:27     ` Thomas Adam

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1328946907-31650-1-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.