fix: merge 动作中,项目克隆到本地后,设置 config.name
This commit is contained in:
@@ -455,7 +455,13 @@ public class GitServiceImpl implements IGitService {
|
||||
.setURI(repoDir.getAbsolutePath())
|
||||
.setDirectory(localPath)
|
||||
.setCredentialsProvider(null)
|
||||
.call()) {
|
||||
.call();
|
||||
Repository repository = git.getRepository();) {
|
||||
StoredConfig config = repository.getConfig();
|
||||
SysUserEntity loginUserEntity = userService.getById(StpUtil.getLoginIdAsString());
|
||||
config.setString("user", null, "name", loginUserEntity.getName());
|
||||
config.setString("user", null, "email", "asw@geedgenetworks.com");
|
||||
config.save();
|
||||
|
||||
// git fetch
|
||||
git.fetch().call();
|
||||
@@ -474,7 +480,7 @@ public class GitServiceImpl implements IGitService {
|
||||
.setMessage(message)
|
||||
.setStrategy(MergeStrategy.RECURSIVE)
|
||||
.setFastForward(MergeCommand.FastForwardMode.NO_FF)
|
||||
.include(git.getRepository().findRef("origin/" + srcBranch))
|
||||
.include(repository.findRef("origin/" + srcBranch))
|
||||
.call();
|
||||
|
||||
MergeResult.MergeStatus mergeStatus = mergeResult.getMergeStatus();
|
||||
|
||||
Reference in New Issue
Block a user