From 8456cb3f2b5d31565a5800ca71ff248db4b3b5d0 Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Wed, 23 Nov 2011 17:03:21 +0100 Subject: [PATCH] Adapt merge message to C Git for remote-tracking branch Commit 13931236b9ee2895a98ffdbdacbd0f895956d8a8 in C Git (2011-11-02) changed the message format: -Merge remote branch 'origin/foo' +Merge remote-tracking branch 'origin/foo' This change does the same in EGit to be consistent. Change-Id: I7d9c5afa95771dbfe6079b5f89a10b248fee0172 Signed-off-by: Robin Stocker --- .../tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java | 4 ++-- .../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 4ccc0f9be..73fb838f0 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 void testRemoteBranch() throws Exception { 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 void testMixed() throws IOException { 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 11f3b7a3f..1a26ecfe1 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 @@ else if (ref.getName().equals(ref.getObjectId().getName())) 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"));