|
|
|
@ -168,6 +168,15 @@ public class MergeMessageFormatterTest extends SampleDataRepositoryTestCase {
|
|
|
|
|
assertEquals("Merge branch 'a' into b", message); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testIntoHeadOtherThanMaster() throws IOException { |
|
|
|
|
Ref a = db.getRef("refs/heads/a"); |
|
|
|
|
Ref b = db.getRef("refs/heads/b"); |
|
|
|
|
SymbolicRef head = new SymbolicRef("HEAD", b); |
|
|
|
|
String message = formatter.format(Arrays.asList(a), head); |
|
|
|
|
assertEquals("Merge branch 'a' into b", message); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@Test |
|
|
|
|
public void testIntoSymbolicRefHeadPointingToMaster() throws IOException { |
|
|
|
|
Ref a = db.getRef("refs/heads/a"); |
|
|
|
|