File tree Expand file tree Collapse file tree 1 file changed +8
-8
lines changed
src/main/java/org/scm4j/vcs Expand file tree Collapse file tree 1 file changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -167,7 +167,7 @@ public void deleteBranch(String branchName, String commitMessage) {
167
167
.setForce (true ) // avoid "not merged" exception
168
168
.call ();
169
169
170
- RefSpec refSpec = new RefSpec ( ":refs/heads/" + branchName );
170
+ RefSpec refSpec = new RefSpec (":refs/heads/" + branchName );
171
171
172
172
push (git , refSpec );
173
173
} catch (GitAPIException e ) {
@@ -450,13 +450,13 @@ public Set<String> getBranches(String path) {
450
450
try (IVCSLockedWorkingCopy wc = repo .getVCSLockedWorkingCopy ();
451
451
Git git = getLocalGit (wc );
452
452
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();
460
460
461
461
git
462
462
.pull ()
You can’t perform that action at this time.
0 commit comments