Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-12-21 15:59:48 +01:00
Code Issues Packages Projects Releases Activity

Invert merge to get proper file diff

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-11-15 09:31:08 +01:00
parent ff1abf2c1c
commit ecec0764f8
1 changed files with 5 additions and 5 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/GitMergeCommand.java
View File

@@ -49,7 +49,7 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
@Override
public MergeConflictResult computeConflicts(MergeCommandRequest request) {
return inClone(git -> new ConflictWorker(git, request), workdirFactory, request.getBranchToMerge());
return inClone(git -> new ConflictWorker(git, request), workdirFactory, request.getTargetBranch());
}
private MergeCommandResult mergeWithStrategy(MergeCommandRequest request) {
@@ -104,8 +104,8 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
private ConflictWorker(Git git, MergeCommandRequest request) {
super(git, context, repository);
theirs = request.getTargetBranch();
ours = request.getBranchToMerge();
theirs = request.getBranchToMerge();
ours = request.getTargetBranch();
treeParser = new CanonicalTreeParser();
diffBuffer = new ByteArrayOutputStream();
@@ -146,10 +146,10 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
result.addAddedByBoth(path);
break;
case DELETED_BY_THEM:
result.addDeletedByThem(path);
result.addDeletedByUs(path);
break;
case DELETED_BY_US:
result.addDeletedByUs(path);
result.addDeletedByThem(path);
break;
default:
throw new InternalRepositoryException(context.getRepository(), "unexpected conflict type: " + stageState);