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: TestRepository: Ignore existing Change-Id in message

Change-Id: I343c3065fa369ef8aab2b033ac1e392b28d10daf
---
 org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'org.eclipse.jgit.junit/src/org')

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);
-- 
cgit v1.2.3