Fixes recursive browse for git (#1833)

The recursive browse command failed to list files
that started with a name of a folder. These were
listed as children of the folder that has the same
name as the prefix of the file.

scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java

@@ -283,7 +283,7 @@ public class GitBrowseCommand extends AbstractGitCommand
     parents.push(parent);
     while (treeWalk.next()) {
       final String currentPath = treeWalk.getPathString();
-      while (!currentPath.startsWith(parents.peek().pathString)) {
+      while (!currentPath.startsWith(appendTrailingSlashIfNeeded(parents))) {
         parents.pop();
       }
       TreeEntry currentParent = parents.peek();
@@ -300,6 +300,11 @@ public class GitBrowseCommand extends AbstractGitCommand
     }
   }
 
+  private String appendTrailingSlashIfNeeded(Deque<TreeEntry> parents) {
+    String path = parents.peek().pathString;
+    return path.length() == 0? path: path + "/";
+  }
+
   private FileObject findFirstMatch(TreeWalk treeWalk) throws IOException {
     String[] pathElements = request.getPath().split("/");
     int currentDepth = 0;

scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommand_RecursiveDirectoryNameTest.java

@@ -0,0 +1,85 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package sonia.scm.repository.spi;
+
+import org.junit.Test;
+import sonia.scm.repository.FileObject;
+import sonia.scm.web.lfs.LfsBlobStoreFactory;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static sonia.scm.repository.spi.SyncAsyncExecutors.synchronousExecutor;
+
+/**
+ * Unit tests for {@link GitBrowseCommand}.
+ *
+ * @author Sebastian Sdorra
+ */
+public class GitBrowseCommand_RecursiveDirectoryNameTest extends AbstractGitCommandTestBase {
+
+  private final LfsBlobStoreFactory lfsBlobStoreFactory = mock(LfsBlobStoreFactory.class);
+
+  @Test
+  public void testRecursive() throws IOException {
+    BrowseCommandRequest request = new BrowseCommandRequest();
+
+    request.setRecursive(true);
+
+    FileObject root = createCommand().getBrowserResult(request).getFile();
+
+    Collection<FileObject> foList = root.getChildren();
+
+    assertThat(foList)
+      .extracting("name")
+      .containsExactly("c", "a.txt", "b.txt", "cw", "f.txt");
+
+    FileObject c = findFolder(foList);
+
+    Collection<FileObject> cChildren = c.getChildren();
+    assertThat(cChildren)
+      .extracting("name")
+      .containsExactly("d.txt", "e.txt");
+  }
+
+  private FileObject findFolder(Collection<FileObject> foList) {
+    return foList.stream()
+      .filter(f -> "c".equals(f.getName()))
+      .findFirst()
+      .orElseThrow(() -> new AssertionError("file " + "c" + " not found"));
+  }
+
+  @Override
+  protected String getZippedRepositoryResource()
+  {
+    return "sonia/scm/repository/spi/scm-git-spi-browse-recursive-test.zip";
+  }
+
+  private GitBrowseCommand createCommand() {
+    return new GitBrowseCommand(createContext(), lfsBlobStoreFactory, synchronousExecutor());
+  }
+}