Delete deprecated Merger.getBaseCommit()

Change-Id: I3b39a2c0d547110709b4c28b66c4694cdef943e8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 0 insertions, 33 deletions

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
index a76dd350d5..983bf5c91c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/Merger.java
@@ -51,7 +51,6 @@ import org.eclipse.jgit.errors.NoMergeBaseException;
 import org.eclipse.jgit.errors.NoMergeBaseException.MergeBaseFailureReason;
 import org.eclipse.jgit.internal.JGitText;
 import org.eclipse.jgit.lib.AnyObjectId;
-import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.ObjectInserter;
 import org.eclipse.jgit.lib.ObjectReader;
@@ -220,38 +219,6 @@ public abstract class Merger {
 
 	/**
 	 * Return the merge base of two commits.
-	 * <p>
-	 * May only be called after {@link #merge(RevCommit...)}.
-	 *
-	 * @param aIdx
-	 *            index of the first commit in tips passed to
-	 *            {@link #merge(RevCommit...)}.
-	 * @param bIdx
-	 *            index of the second commit in tips passed to
-	 *            {@link #merge(RevCommit...)}.
-	 * @return the merge base of two commits
-	 * @throws IncorrectObjectTypeException
-	 *             one of the input objects is not a commit.
-	 * @throws IOException
-	 *             objects are missing or multiple merge bases were found.
-	 * @deprecated use {@link #getBaseCommitId()} instead, as that does not
-	 *             require walking the commits again
-	 */
-	@Deprecated
-	public RevCommit getBaseCommit(final int aIdx, final int bIdx)
-			throws IncorrectObjectTypeException,
-			IOException {
-		if (sourceCommits[aIdx] == null)
-			throw new IncorrectObjectTypeException(sourceObjects[aIdx],
-					Constants.TYPE_COMMIT);
-		if (sourceCommits[bIdx] == null)
-			throw new IncorrectObjectTypeException(sourceObjects[bIdx],
-					Constants.TYPE_COMMIT);
-		return getBaseCommit(sourceCommits[aIdx], sourceCommits[bIdx]);
-	}
-
-	/**
-	 * Return the merge base of two commits.
 	 *
 	 * @param a
 	 *            the first commit in {@link #sourceObjects}.