diff options
| -rw-r--r-- | org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java | 10 |
2 files changed, 14 insertions, 0 deletions
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 371e139a88..2afc7163b0 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -1045,6 +1045,10 @@ public class TestRepository<R extends Repository> { private void insertChangeId(org.eclipse.jgit.lib.CommitBuilder c) throws IOException { + int idx = ChangeIdUtil.indexOfChangeId(message, "\n"); + if (idx >= 0) + return; + ObjectId firstParentId = null; if (!parents.isEmpty()) firstParentId = parents.get(0); 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 87ce011763..09259de7db 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java @@ -103,6 +103,16 @@ public class TestRepositoryTest { } @Test + public void insertChangeIdIgnoresExisting() throws Exception { + String msg = "message\n" + + "\n" + + "Change-Id: Ideadbeefdeadbeefdeadbeefdeadbeefdeadbeef\n"; + RevCommit c = tr.commit().message(msg).insertChangeId().create(); + rw.parseBody(c); + assertEquals(msg, c.getFullMessage()); + } + + @Test public void resetFromSymref() throws Exception { repo.updateRef("HEAD").link("refs/heads/master"); Ref head = repo.getRef("HEAD"); |