From c813a5f72350d82e9b4917a4bd1e578fb8bc2c85 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Mon, 10 Aug 2020 11:54:19 +0200
Subject: [PATCH] ".git" extension not allowed on the end of repository name

---
 scm-core/src/main/java/sonia/scm/util/ValidationUtil.java     | 2 +-
 scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java b/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
index 0342e9b392..730a08c545 100644
--- a/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
+++ b/scm-core/src/main/java/sonia/scm/util/ValidationUtil.java
@@ -47,7 +47,7 @@ public final class ValidationUtil
   public static final String REGEX_NAME =
     "^[A-Za-z0-9\\.\\-_][A-Za-z0-9\\.\\-_@]*$";
 
-  public static final String REGEX_REPOSITORYNAME = "(?!^\\.\\.$)(?!^\\.$)(?!.*[\\\\\\[\\]])^[A-Za-z0-9\\.][A-Za-z0-9\\.\\-_]*$";
+  public static final String REGEX_REPOSITORYNAME = "(?!^\\.\\.$)(?!^\\.$)(?!.*[\\\\\\[\\]])(?!.*[.]git$)^[A-Za-z0-9\\.][A-Za-z0-9\\.\\-_]*$";
 
   /** Field description */
   private static final Pattern PATTERN_REPOSITORYNAME = Pattern.compile(REGEX_REPOSITORYNAME);
diff --git a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java
index 184d5c3bd2..a5f81a7150 100644
--- a/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java
+++ b/scm-core/src/test/java/sonia/scm/util/ValidationUtilTest.java
@@ -202,7 +202,9 @@ public class ValidationUtilTest
       "scm/main",
       "scm/plugins/git-plugin",
       "_scm",
-      "-scm"
+      "-scm",
+      "scm.git",
+      "scm.git.git"
     };
 
     for (String path : validPaths) {