From e92c6d230b3a350749fdb9fa2150bb1773260b8c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 28 Oct 2012 13:27:26 -0400
Subject: [PATCH] Experimental JGit-based GC Executor

---
 src/com/gitblit/FederationPullExecutor.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/FederationPullExecutor.java b/src/com/gitblit/FederationPullExecutor.java
index 19afacc..ad1022c 100644
--- a/src/com/gitblit/FederationPullExecutor.java
+++ b/src/com/gitblit/FederationPullExecutor.java
@@ -189,11 +189,17 @@
 							repositoryName.indexOf(DOT_GIT_EXT));
 				}
 			}
-
+			
 			// confirm that the origin of any pre-existing repository matches
 			// the clone url
 			String fetchHead = null;
 			Repository existingRepository = GitBlit.self().getRepository(repositoryName);
+			
+			if (existingRepository == null && GitBlit.self().isCollectingGarbage(repositoryName)) {
+				logger.warn(MessageFormat.format("Skipping local repository {0}, busy collecting garbage", repositoryName));
+				continue;
+			}
+
 			if (existingRepository != null) {
 				StoredConfig config = existingRepository.getConfig();
 				config.load();

--
Gitblit v1.9.1