Skip & offset not applied when an explicit filter like NO_MERGES is set for LogCommand

[parasharjoshi]

Version

6.7.0

Operating System

Linux/Unix, Windows

Bug description

When a log command is set with an explicit RevFilter like NO_MERGES or ONLY_MERGES, the properties of maxCount & skip set via the setters is ignored/overridden.

Code block which is expected to set the maxCount & skip is

LogCommand logCommand = git.log();
Iterable<RevCommit> logResult = 
    logCommand
        .setSkip(10)
        .setMaxCount(10)
        .setRevFilter(RevFilter.NO_MERGES)
        .call();

This filters out merge commits but does not skip or limit the results as specified in the setters.

The work around is to set the skip and max RevFilters explicitly in the filter order as following

List revFilters = new  ArrayList();
    revFilters.add(RevFilter.NO_MERGES);// Exclude Merge commits
    revFilters.add(SkipRevFilter.create(10)); // skip
    revFilters.add(MaxCountRevFilter.create(10)); // maxCount
    
Iterable<RevCommit> logResult = 
    logCommand
        .setRevFilter(AndRevFilter.create(revFilters))
        .call();

This is not obvious and not a documented behaviour hence logging this bug.

Actual behavior

The set skip & maxCount are not applied to the LogCommand results

Expected behavior

The set skip & maxCount are applied to the LogCommand results.

Relevant log output

No response

Other information

No response