gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge 动作中，项目克隆到本地后，设置 config.name

Browse Source
This commit is contained in:
shizhendong
2024-11-13 10:37:39 +08:00
parent 37f22f2817
commit cd61c898e5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
View File

@@ -455,7 +455,13 @@ public class GitServiceImpl implements IGitService {
.setURI(repoDir.getAbsolutePath()) .setURI(repoDir.getAbsolutePath())
.setDirectory(localPath) .setDirectory(localPath)
.setCredentialsProvider(null) .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
git.fetch().call(); git.fetch().call();
@@ -474,7 +480,7 @@ public class GitServiceImpl implements IGitService {
.setMessage(message) .setMessage(message)
.setStrategy(MergeStrategy.RECURSIVE) .setStrategy(MergeStrategy.RECURSIVE)
.setFastForward(MergeCommand.FastForwardMode.NO_FF) .setFastForward(MergeCommand.FastForwardMode.NO_FF)
.include(git.getRepository().findRef("origin/" + srcBranch)) .include(repository.findRef("origin/" + srcBranch))
.call(); .call();
MergeResult.MergeStatus mergeStatus = mergeResult.getMergeStatus(); MergeResult.MergeStatus mergeStatus = mergeResult.getMergeStatus();