From b9a00770629a7dc2b776f8bdb366afbdfba9357d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konrad=20K=C3=BCgler?= <swamblumat-eclipsebugs@yahoo.de>
Date: Fri, 16 May 2014 18:33:12 +0200
Subject: [PATCH] Repository.writeMergeHeads to accept a list with subtypes of
 ObjectId
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allows to pass for example a List<RevCommit>.

Change-Id: I5522707060d7d3e0d848ba579956dc62f8fa0234
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
---
 org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
index 1538d277b..37e31ef47 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java
@@ -1393,7 +1393,7 @@ public abstract class Repository {
 	 *            $GIT_DIR/MERGE_HEAD or <code>null</code> to delete the file
 	 * @throws IOException
 	 */
-	public void writeMergeHeads(List<ObjectId> heads) throws IOException {
+	public void writeMergeHeads(List<? extends ObjectId> heads) throws IOException {
 		writeHeadsFile(heads, Constants.MERGE_HEAD);
 	}
 
@@ -1590,7 +1590,7 @@ public abstract class Repository {
 	 * @throws FileNotFoundException
 	 * @throws IOException
 	 */
-	private void writeHeadsFile(List<ObjectId> heads, String filename)
+	private void writeHeadsFile(List<? extends ObjectId> heads, String filename)
 			throws FileNotFoundException, IOException {
 		File headsFile = new File(getDirectory(), filename);
 		if (heads != null) {