Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 19:15:52 +01:00
Code Issues Packages Projects Releases Activity

Fix migration of non-bare git repositories

Browse Source 
During the migration of git repositories from v1 to v2, we have to
create an "scmm" config section with the repository id of the current
repository. If this does not happen, further write requests to this
repository will fail, because the hooks cannot determine the id.

However, the migration failed to write this configuration for non-bare
repositories. Therefore this fix checks beforehand, whether a '.git'
folder exists in the date directory. If this is the case, we assume that
this is a non-bare repository and write the config file inside this
folder.
This commit is contained in:
René Pfeuffer
2020-06-23 11:40:08 +02:00
parent e4ca2c2490
commit 086a471161
3 changed files with 112 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/update/GitV2UpdateStep.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.repository.update;
import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
@@ -38,6 +38,7 @@ import sonia.scm.version.Version;
import javax.inject.Inject;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import static sonia.scm.version.Version.parse;
@@ -60,7 +61,8 @@ public class GitV2UpdateStep implements UpdateStep {
(repositoryId, path) -> {
Repository repository = repositoryMetadataAccess.read(path);
if (isGitDirectory(repository)) {
try (org.eclipse.jgit.lib.Repository gitRepository = build(path.resolve("data").toFile())) {
final Path effectiveGitPath = determineEffectiveGitFolder(path);
try (org.eclipse.jgit.lib.Repository gitRepository = build(effectiveGitPath.toFile())) {
new GitConfigHelper().createScmmConfig(repository, gitRepository);
} catch (IOException e) {
throw new UpdateException("could not update repository with id " + repositoryId + " in path " + path, e);
@@ -70,6 +72,18 @@ public class GitV2UpdateStep implements UpdateStep {
);
}
public Path determineEffectiveGitFolder(Path path) {
Path bareGitFolder = path.resolve("data");
Path nonBareGitFolder = bareGitFolder.resolve(".git");
final Path effectiveGitPath;
if (Files.exists(nonBareGitFolder)) {
effectiveGitPath = nonBareGitFolder;
} else {
effectiveGitPath = bareGitFolder;
}
return effectiveGitPath;
}
private org.eclipse.jgit.lib.Repository build(File directory) throws IOException {
return new FileRepositoryBuilder()
.setGitDir(directory)