Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] Handle multiple merge points when searching for common ancestor

Dariusz Luksza <dariusz.luksza@xxxxxxxxx> wrote:
> One more question, is it possible that there wouldn't be any merge
> base? eg. first call of next() would return null ?

Yes!

If one side had completely rewritten history, such as by running `git
filter-branch`, it is possible that there is now no common ancestor.
In such a case, you get null back from the first call to next().

-- 
Shawn.


Back to the top