From 56da320d53dfad84bb7aa32eac9f28a3349732a7 Mon Sep 17 00:00:00 2001 From: Bruce Zu Date: Thu, 20 Dec 2012 16:26:50 +0800 Subject: [PATCH] Fix: cache data inconsistent with disk According to [1], Gerrit drops project names' trailing '.git' suffix before adding them to the cache as the KEY, however for the corner case of creating a project like 'p.git.git', Gerrit will create 'p.git', NOT 'p.git.git', on disk and cache it as 'p.git'. [1]. LocalDiskRepositoryManager.getProjectName() Change-Id: I578dc56cf87aedfd09bd8d1ddddc08d43ad2a9e0 --- .../google/gerrit/server/git/LocalDiskRepositoryManager.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java index 44cb9a71e4..e23e84974e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java @@ -177,10 +177,7 @@ public class LocalDiskRepositoryManager implements GitRepositoryManager { // It doesn't exist under any of the standard permutations // of the repository name, so prefer the standard bare name. // - String n = name.get(); - if (!n.endsWith(Constants.DOT_GIT_EXT)) { - n = n + Constants.DOT_GIT_EXT; - } + String n = name.get() + Constants.DOT_GIT_EXT; loc = FileKey.exact(new File(basePath, n), FS.DETECTED); }