The Unified and Autonomous Development Platform
Use author of source commit as author of squashed commit
robin shinebed3efc91b91
diff --git a/commons.git/src/main/java/com/gitplex/commons/git/GitUtils.java b/commons.git/src/main/java/com/gitplex/commons/git/GitUtils.javaindex 91f0a21600..90828cceb3 100644--- a/commons.git/src/main/java/com/gitplex/commons/git/GitUtils.java+++ b/commons.git/src/main/java/com/gitplex/commons/git/GitUtils.java@@ -396,7 +396,7 @@ public class GitUtils {@Nullablepublic static ObjectId merge(Repository repository, ObjectId source, ObjectId target,- boolean squash, PersonIdent who, String commitMessage) {+ boolean squash, PersonIdent committer, String commitMessage) {try ( RevWalk revWalk = new RevWalk(repository);ObjectInserter inserter = repository.newObjectInserter();) {RevCommit sourceCommit = revWalk.parseCommit(source);@@ -404,8 +404,8 @@ public class GitUtils {Merger merger = MergeStrategy.RECURSIVE.newMerger(repository, true);if (merger.merge(targetCommit, sourceCommit)) {CommitBuilder mergedCommit = new CommitBuilder();- mergedCommit.setAuthor(who);- mergedCommit.setCommitter(who);+ mergedCommit.setAuthor(sourceCommit.getAuthorIdent());+ mergedCommit.setCommitter(committer);if (squash)mergedCommit.setParentId(targetCommit);else