Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-16 03:26:54 +01:00
Code Issues Packages Projects Releases Activity

Fix error in cat command on empty repository

Browse Source
This commit is contained in:
Rene Pfeuffer
2026-01-26 13:43:28 +00:00
committed by Thomas Zerr
parent fd3231a24f
commit a378ad97e3
3 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/cat_command.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: fixed
description: Internal server error for cat command on empty repository

5
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitCatCommand.java
View File

@@ -85,7 +85,10 @@ public class GitCatCommand extends AbstractGitCommand implements CatCommand {
org.eclipse.jgit.lib.Repository repo = open();
ObjectId revId = getCommitOrDefault(repo, request.getRevision());
if (revId == null) {
throw notFound(entity("Revision", request.getRevision()).in(repository));
throw notFound(entity(
"Revision",
request.getRevision() == null ? "default" : request.getRevision()
).in(repository));
}
LOG.debug("loading content for file {} for revision {} in repository {}", request.getPath(), revId, repository);
return getLoader(repo, revId, request.getPath());

52
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitCatCommand_onEmptyRepositoryTest.java Normal file
View File

@@ -0,0 +1,52 @@
/*
* Copyright (c) 2020 - present Cloudogu GmbH
*
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU Affero General Public License as published by the Free
* Software Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
* details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see https://www.gnu.org/licenses/.
*/
package sonia.scm.repository.spi;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import sonia.scm.NotFoundException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
public class GitCatCommand_onEmptyRepositoryTest extends AbstractGitCommandTestBase {
@Rule
public final ExpectedException expectedException = ExpectedException.none();
@Test(expected = NotFoundException.class)
public void testCatResult() throws IOException {
CatCommandRequest request = new CatCommandRequest();
request.setPath("a.txt");
ByteArrayOutputStream baos = new ByteArrayOutputStream();
new GitCatCommand(createContext(), null).getCatResult(request, baos);
}
@Test(expected = NotFoundException.class)
public void testStream() throws IOException {
CatCommandRequest request = new CatCommandRequest();
request.setPath("a.txt");
new GitCatCommand(createContext(), null).getCatResultStream(request);
}
@Override
protected String getZippedRepositoryResource() {
return "sonia/scm/repository/spi/scm-git-empty-repo.zip";
}
}