Eclipse Community Forums: EGit / JGit

Help

Home

Home » Eclipse Projects » EGit / JGit » JGit Find Merge Base

Show: Today's Messages :: Show Polls :: Message Navigator

JGit Find Merge Base [message #1781943]

Wed, 14 February 2018 20:54

Ricky Veach

Messages: 5
Registered: April 2011

Junior Member

I am trying to find the common ancestor between any 2 commits, also known as the merge base.
I tried using code like the one found at https://stackoverflow.com/a/26436588/1016482 , but it seems to fail in a specific situation.

If I give it 2 branches, where one branch has diverged with many new commits, it returns the correct merge base commit.
However, if I give it a commit and the commit's parent, it doesn't return the commit's parent as the merge base. Instead it returns the commit 2 parents from that.

Example:
Code:

	public static RevCommit getCommonAncestor(Repository repository, RevCommit commit1,
			RevCommit commit2) {
		RevWalk walk = null;

		try {
			walk = new RevWalk(repository);
			walk.setRevFilter(RevFilter.MERGE_BASE);
			walk.markStart(commit1);
			walk.markStart(commit2);

			final RevCommit base = walk.next();

			if ((base != null) && (walk.next() == null)) {
				return base;
			}
		}
		catch (IOException e) {
			e.printStackTrace();
		}
		finally {
			if (walk != null) {
				walk.reset();
				walk.close();
				walk.dispose();
			}
		}

		return null;
	}

Repository:
Head -> A -> B -> C -> D

So Commit A is the parent of Head and so on.
Expected Result of `getCommonAncestor(repository, CommitA, HEAD)` should be commit A.
What is actually returned is commit C.

Is there something I am doing wrong? Can I not use merge base in this circumstance or is this a bug?
I am using `org.eclipse.jgit` version `4.10.0.201712302008-r`.

[Updated on: Wed, 14 February 2018 22:07]

Report message to a moderator

Re: JGit Find Merge Base [message #1781945 is a reply to message #1781943]

Wed, 14 February 2018 22:51

Ricky Veach

Messages: 5
Registered: April 2011

Junior Member

I don't know why, but the method works correctly when I re-parse the commits again before trying the merge base.

			walk = new RevWalk(git.getRepository());

			commit1 = walk.parseCommit(commit1);
			commit2 = walk.parseCommit(commit2);

The only thing I did with the commits outside the method was retrieve them via another method.

	public static RevCommit getCommit(Repository repository, String commitId) {
		RevCommit result = null;
		RevWalk walk = null;

		try {
			final ObjectId commitObject = repository.resolve(commitId);

			if (commitObject != null) {
				walk = new RevWalk(repository);

				result = walk.parseCommit(commitObject);
			}
		}
		catch (RevisionSyntaxException | IOException e) {
			e.printStackTrace();
		}
		finally {
			if (walk != null) {
				walk.close();
				walk.dispose();
			}
		}

		return result;
	}

Can any one explain if I am doing something wrong that would require this extra code?

Report message to a moderator