Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-06 15:42:12 +01:00
Code Issues Packages Projects Releases Activity

Fix check for lfs files

Browse Source 
This fixes the check for LFS files used in git imports
and mirror command.

First this checks for LFS files recursively in the tree
(in other words, before LFS files were found only in
the root directory).

Second, this fixes a bug in the used JGit lfs filter by
checking, whether the checked tree entry is a normal
file. This prevents missing object exceptions during
the check when the repository contains a submodule.

Committed-by: Thomas Zerr <thomas.zerr@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2023-08-31 15:45:13 +02:00
parent b30b9d2110
commit 545a2061ae
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/changelog/load_lfs_for_mirror_and_import.yaml Normal file
View File

@@ -0,0 +1,4 @@
- type: fixed
description: Loading LFS files for imports and mirrors
- type: fixed
description: Handling of submodules in imports and mirrors

25
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/LfsLoader.java
View File

@@ -24,6 +24,7 @@
package sonia.scm.repository.spi;
import org.eclipse.jgit.errors.MissingObjectException;
import org.eclipse.jgit.lfs.Lfs;
import org.eclipse.jgit.lfs.LfsPointer;
import org.eclipse.jgit.lfs.Protocol;
@@ -32,6 +33,7 @@ import org.eclipse.jgit.lfs.lib.AnyLongObjectId;
import org.eclipse.jgit.lfs.lib.LfsPointerFilter;
import org.eclipse.jgit.lib.ConfigConstants;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -85,7 +87,8 @@ class LfsLoader {
.setString(ConfigConstants.CONFIG_SECTION_LFS, null, ConfigConstants.CONFIG_KEY_URL, computeLfsUrl(sourceUrl));
TreeWalk treeWalk = new TreeWalk(gitRepository);
treeWalk.setFilter(new LfsPointerFilter());
treeWalk.setFilter(new ScmLfsPointerFilter());
treeWalk.setRecursive(true);
RevWalk revWalk = new RevWalk(gitRepository);
revWalk.markStart(revWalk.parseCommit(newObjectId));
@@ -184,4 +187,24 @@ class LfsLoader {
void loading(String name);
}
/**
* Fixes a bug in {@link org.eclipse.jgit.lfs.lib.LfsPointerFilter} for repositories containing submodules.
* These result in a {@link MissingObjectException} when the original class is used, because the filter tries
* to load the sha hash for the submodule as a simple file. To prevent this, this extension overrides
* {@link #include(TreeWalk)} and checks first, whether the walk points to a regular file before proceeding
* with the original implemantation.
*
* In later implementations this fix should be implemented in JGit directly. This subclass can then be removed.
*/
private static class ScmLfsPointerFilter extends LfsPointerFilter {
@Override
public boolean include(TreeWalk walk) throws IOException {
if (walk.getFileMode().equals(FileMode.GITLINK)) {
return false;
}
return super.include(walk);
}
}
}