From 6ed07f5cb5f5c296c8abca8ac06a6f923b96119c Mon Sep 17 00:00:00 2001
From: Dave Borowitz <dborowitz@google.com>
Date: Thu, 12 Mar 2015 12:01:44 -0700
Subject: [PATCH] TestRepository: Ignore existing Change-Id in message

Change-Id: I343c3065fa369ef8aab2b033ac1e392b28d10daf
---
 .../src/org/eclipse/jgit/junit/TestRepository.java     |  4 ++++
 .../tst/org/eclipse/jgit/junit/TestRepositoryTest.java | 10 ++++++++++
 2 files changed, 14 insertions(+)

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 371e139a8..2afc7163b 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 RevCommit create() throws Exception {
 
 		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 87ce01176..09259de7d 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
@@ -102,6 +102,16 @@ public void insertChangeId() throws Exception {
 				c2.getFullMessage());
 	}
 
+	@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");