Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-04 21:59:10 +01:00
Code Issues Packages Projects Releases Activity

Add test for git reclaim of workdir

Browse Source
This commit is contained in:
René Pfeuffer
2020-04-18 14:31:32 +02:00
parent 7e89a0c1c0
commit e5f4ad72d6
3 changed files with 88 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/SimpleGitWorkdirFactory.java
View File

@@ -93,8 +93,8 @@ public class SimpleGitWorkdirFactory extends SimpleWorkdirFactory<Repository, Re
git.reset().setMode(ResetCommand.ResetType.HARD).call();
git.clean().setForce(true).setCleanDirectories(true).call();
git.fetch().call();
git.branchDelete().setBranchNames(initialBranch).setForce(true).call();
git.checkout().setForced(true).setName("origin/" + initialBranch).call();
git.branchDelete().setBranchNames(initialBranch).setForce(true).call();
git.checkout().setName(initialBranch).setCreateBranch(true).call();
return new ParentAndClone<>(null, repo, target);
} catch (GitAPIException e) {
@@ -106,7 +106,7 @@ public class SimpleGitWorkdirFactory extends SimpleWorkdirFactory<Repository, Re
}
}
private String createScmTransportProtocolUri(File bareRepository) {
String createScmTransportProtocolUri(File bareRepository) {
if (SystemUtil.isWindows()) {
return ScmTransportProtocol.NAME + ":///" + bareRepository.getAbsolutePath().replaceAll("\\\\", "/");
} else {