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

On Wed, Jul 7, 2010 at 1:26 AM, Shawn O. Pearce <spearce@xxxxxxxxxxx> wrote:
> 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().

Good to know, I'll handle that before someone raise a bug for this ;)


Best regards

GSM: +48 695 192 160

Back to the top