TestRepository: Support committing to unborn symref

Change-Id: I6bcee635adda7c929f6fa68ef20438fe77e49184

diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java
index a299d144d4c681d95ee47eeff68fe96eedfb93a1..371e139a889ad733d9fc7df279a8ec3817ecba1a 100644 (file)
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java
@@ -887,9 +887,8 @@ public class TestRepository<R extends Repository> {
                        branch = b;
 
                        Ref ref = db.getRef(branch.ref);
-                       if (ref != null) {
+                       if (ref != null && ref.getObjectId() != null)
                                parent(pool.parseCommit(ref.getObjectId()));
-                       }
                }
 
                CommitBuilder(CommitBuilder prior) throws Exception {

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java
index cc8ed504d00312ff8d5531a9279881b1a9b81376..87ce0117637f11eda8cd5d2e39935a097af7dc52 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java
@@ -265,6 +265,16 @@ public class TestRepositoryTest {
                assertEquals("bar contents", blobAsString(amended, "bar"));
        }
 
+       @Test
+       public void commitToUnbornHead() throws Exception {
+               repo.updateRef("HEAD").link("refs/heads/master");
+               RevCommit root = tr.branch("HEAD").commit().create();
+               Ref ref = repo.getRef(Constants.HEAD);
+               assertEquals(root, ref.getObjectId());
+               assertTrue(ref.isSymbolic());
+               assertEquals("refs/heads/master", ref.getTarget().getName());
+       }
+
        private String blobAsString(AnyObjectId treeish, String path)
                        throws Exception {
                RevObject obj = tr.get(rw.parseTree(treeish), path);