diff options
| author | Robin Stocker <robin@nibor.org> | 2011-05-05 17:33:01 +0200 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2011-05-05 17:50:44 +0200 |
| commit | 7546e3b4c5612e5f6ee564d0d01b17533e7e0b3b (patch) | |
| tree | 8e7e81579316132cfab6364073685781143fc0cf /org.eclipse.jgit | |
| parent | eb9dba2fde1b0581ecae1e509a981a6158285f39 (diff) | |
| download | jgit-7546e3b4c5612e5f6ee564d0d01b17533e7e0b3b.tar.gz jgit-7546e3b4c5612e5f6ee564d0d01b17533e7e0b3b.zip | |
Fix "into" part of merge message for HEAD
Merging into a non-master branch would result in the following message:
Merge branch 'a' into HEAD
Now the merge message is correct:
Merge branch 'a' into b
Change-Id: I488f97190e4c1711c23a7a3cbd64f8b13a87bbac
Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java index 96395d0bfa..11f3b7a3fd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java @@ -115,8 +115,7 @@ public class MergeMessageFormatter { String targetName = target.getLeaf().getName(); if (!targetName.equals(Constants.R_HEADS + Constants.MASTER)) { - String targetShortName = Repository - .shortenRefName(target.getName()); + String targetShortName = Repository.shortenRefName(targetName); sb.append(" into " + targetShortName); } |