Skip to content

Commit 9a423f4

Browse files
committed
Fix getBranches() to make scm4j-release work
1 parent 3f94798 commit 9a423f4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/main/java/org/scm4j/vcs/GitVCS.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void deleteBranch(String branchName, String commitMessage) {
167167
.setForce(true) // avoid "not merged" exception
168168
.call();
169169

170-
RefSpec refSpec = new RefSpec( ":refs/heads/" + branchName);
170+
RefSpec refSpec = new RefSpec(":refs/heads/" + branchName);
171171

172172
push(git, refSpec);
173173
} catch (GitAPIException e) {
@@ -450,13 +450,13 @@ public Set<String> getBranches(String path) {
450450
try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
451451
Git git = getLocalGit(wc);
452452
Repository gitRepo = git.getRepository()) {
453-
454-
git
455-
.fetch()
456-
.setRefSpecs(new RefSpec("+refs/heads/*:refs/heads/*"))
457-
.setRemoveDeletedRefs(true)
458-
.setCredentialsProvider(credentials)
459-
.call();
453+
// checkout conflict with files in releaser
454+
// git
455+
// .fetch()
456+
// .setRefSpecs(new RefSpec("+refs/heads/*:refs/heads/*"))
457+
// .setRemoveDeletedRefs(true)
458+
// .setCredentialsProvider(credentials)
459+
// .call();
460460

461461
git
462462
.pull()

0 commit comments

Comments
 (0)