Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-01 05:09:50 +01:00
Code Issues Packages Projects Releases Activity

merge 2.0.0

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-10-17 08:34:23 +02:00
parent d69e93406c 12ecfcd443
commit f90b8a987a
632 changed files with 159635 additions and 65454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/AbstractGitCommand.java
View File

@@ -38,6 +38,7 @@ import com.google.common.base.Strings;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.RefNotFoundException;
import org.eclipse.jgit.lib.ObjectId;
@@ -217,7 +218,8 @@ class AbstractGitCommand
Optional<RevCommit> doCommit(String message, Person author) {
Person authorToUse = determineAuthor(author);
try {
if (!clone.status().call().isClean()) {
Status status = clone.status().call();
if (!status.isClean() || isInMerge()) {
return of(clone.commit()
.setAuthor(authorToUse.getName(), authorToUse.getMail())
.setMessage(message)
@@ -225,11 +227,15 @@ class AbstractGitCommand
} else {
return empty();
}
} catch (GitAPIException e) {
} catch (GitAPIException | IOException e) {
throw new InternalRepositoryException(context.getRepository(), "could not commit changes", e);
}
}
private boolean isInMerge() throws IOException {
return clone.getRepository().readMergeHeads() != null && !clone.getRepository().readMergeHeads().isEmpty();
}
void push() {
try {
clone.push().call();