Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 06:25:45 +01:00
Code Issues Packages Projects Releases Activity

Fix checkout of target branch

Browse Source
This commit is contained in:
René Pfeuffer
2018-12-10 08:59:19 +01:00
parent 6193c1edda
commit 8b518d320d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitMergeCommand.java
View File

@@ -95,9 +95,10 @@ public class GitMergeCommand extends AbstractGitCommand implements MergeCommand
} }
} }
private void checkOutTargetBranch() { private void checkOutTargetBranch() throws IOException {
try { try {
clone.checkout().setName(target).call(); ObjectId targetRevision = resolveRevision(target);
clone.checkout().setName(targetRevision.getName()).call();
} catch (RefNotFoundException e) { } catch (RefNotFoundException e) {
logger.debug("could not checkout target branch {} for merge", target, e); logger.debug("could not checkout target branch {} for merge", target, e);
throw notFound(entity("revision", target).in(context.getRepository())); throw notFound(entity("revision", target).in(context.getRepository()));