Skip to content

Commit 608af74

Browse files
committed
refactor
1 parent 6460429 commit 608af74

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -153,22 +153,18 @@ public void deleteBranch(String branchName, String commitMessage) {
153153
try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
154154
Git git = getLocalGit(wc);
155155
Repository gitRepo = git.getRepository()) {
156-
//try {
157156

158-
checkout(git, gitRepo, MASTER_BRANCH_NAME);
157+
checkout(git, gitRepo, MASTER_BRANCH_NAME);
159158

160-
git
161-
.branchDelete()
162-
.setBranchNames(branchName)
163-
.setForce(true) // avoid "not merged" exception
164-
.call();
165-
166-
RefSpec refSpec = new RefSpec( ":refs/heads/" + branchName);
167-
168-
push(git, refSpec);
169-
// } finally {
170-
// git.getRepository().close();
171-
// }
159+
git
160+
.branchDelete()
161+
.setBranchNames(branchName)
162+
.setForce(true) // avoid "not merged" exception
163+
.call();
164+
165+
RefSpec refSpec = new RefSpec( ":refs/heads/" + branchName);
166+
167+
push(git, refSpec);
172168
} catch (GitAPIException e) {
173169
throw new EVCSException(e);
174170
} catch (Exception e) {

0 commit comments

Comments
 (0)