From 029dc643e584b778d57ad3c374336feef3c5d0c4 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 4 Jan 2012 17:04:14 +0100
Subject: [PATCH] fix git hooks for repository structures

---
 .../src/main/java/sonia/scm/web/GitReceiveHook.java      | 9 +++++++--
 .../main/java/sonia/scm/web/GitReceivePackFactory.java   | 5 +++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
index 0ea8769c0f..1c73abd619 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceiveHook.java
@@ -61,6 +61,7 @@ import java.io.File;
 import java.io.IOException;
 
 import java.util.Collection;
+import sonia.scm.repository.RepositoryUtil;
 
 /**
  *
@@ -93,9 +94,10 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
    *
    * @param repositoryManager
    */
-  public GitReceiveHook(RepositoryManager repositoryManager)
+  public GitReceiveHook(RepositoryManager repositoryManager, GitRepositoryHandler handler)
   {
     this.repositoryManager = repositoryManager;
+    this.handler = handler;
   }
 
   //~--- methods --------------------------------------------------------------
@@ -213,7 +215,7 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
   {
     try
     {
-      String repositoryName = directory.getName();
+      String repositoryName = RepositoryUtil.getRepositoryName(handler, directory);
       GitRepositoryHookEvent e = new GitRepositoryHookEvent(directory, newId,
                                    oldId, type);
 
@@ -364,4 +366,7 @@ public class GitReceiveHook implements PreReceiveHook, PostReceiveHook
 
   /** Field description */
   private RepositoryManager repositoryManager;
+  
+  /** Field description */
+  private GitRepositoryHandler handler;
 }
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java
index ed54e5cf24..7d089db9a1 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitReceivePackFactory.java
@@ -44,6 +44,7 @@ import org.eclipse.jgit.transport.resolver.ReceivePackFactory;
 import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
 import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
 
+import sonia.scm.repository.GitRepositoryHandler;
 import sonia.scm.repository.RepositoryManager;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -65,9 +66,9 @@ public class GitReceivePackFactory
    * @param repositoryManager
    */
   @Inject
-  public GitReceivePackFactory(RepositoryManager repositoryManager)
+  public GitReceivePackFactory(RepositoryManager repositoryManager, GitRepositoryHandler handler)
   {
-    hook = new GitReceiveHook(repositoryManager);
+    hook = new GitReceiveHook(repositoryManager, handler);
   }
 
   //~--- methods --------------------------------------------------------------