motiejus
/
jgit
1
Fork 0
Code Releases Activity

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 <robin@nibor.org>
This commit is contained in:
Robin Stocker 2011-11-23 17:03:21 +01:00
parent c3fe50bb18
commit 8456cb3f2b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java
View File

@ -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);
}

4
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java
View File

@ -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"));