diff options
| author | Shawn Pearce <spearce@spearce.org> | 2011-11-23 18:09:06 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-11-23 18:09:06 -0500 |
| commit | 3d76a805ee488fa48fdfc1926b1a704ee7182cb5 (patch) | |
| tree | 9c3e879b50fa97b03c34a3b3068ab05de47fdcd8 | |
| parent | 6ec174bfbad60c7a69d9bb8ce59322d818fb7282 (diff) | |
| parent | 8456cb3f2b5d31565a5800ca71ff248db4b3b5d0 (diff) | |
| download | jgit-3d76a805ee488fa48fdfc1926b1a704ee7182cb5.tar.gz jgit-3d76a805ee488fa48fdfc1926b1a704ee7182cb5.zip | |
Merge "Adapt merge message to C Git for remote-tracking branch"
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java index 4ccc0f9bed..73fb838f0b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java @@ -114,7 +114,7 @@ public class MergeMessageFormatterTest extends SampleDataRepositoryTestCase { Ref remoteA = db.getRef("refs/remotes/origin/remote-a"); Ref master = db.getRef("refs/heads/master"); String message = formatter.format(Arrays.asList(remoteA), master); - assertEquals("Merge remote branch 'origin/remote-a'", message); + assertEquals("Merge remote-tracking branch 'origin/remote-a'", message); } @Test @@ -123,7 +123,7 @@ public class MergeMessageFormatterTest extends SampleDataRepositoryTestCase { Ref remoteA = db.getRef("refs/remotes/origin/remote-a"); Ref master = db.getRef("refs/heads/master"); String message = formatter.format(Arrays.asList(c, remoteA), master); - assertEquals("Merge branch 'c', remote branch 'origin/remote-a'", + assertEquals("Merge branch 'c', remote-tracking branch 'origin/remote-a'", message); } 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 11f3b7a3fd..1a26ecfe1f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java @@ -99,8 +99,8 @@ public class MergeMessageFormatter { listings.add(joinNames(branches, "branch", "branches")); if (!remoteBranches.isEmpty()) - listings.add(joinNames(remoteBranches, "remote branch", - "remote branches")); + listings.add(joinNames(remoteBranches, "remote-tracking branch", + "remote-tracking branches")); if (!tags.isEmpty()) listings.add(joinNames(tags, "tag", "tags")); |