No new functionality or bug fixes since v3, just tidying:
* Tests now use Junio's parent-checking functionality
* BOTTOM flags now set in a neater fashion (I think),
separating it out from the cmdline stuff.
* Creation and use of BOTTOM flag now split into 4 separate
commits - last version was too much for one commit, I feel.
* Finally decided that "relevant" is the word I was looking
for. Obvious, really.
* On the subject of words, remove the only technical use
of "uninteresting" that I found in the Documentation - I know
that it always confused me until I read the source.
This sequence is based on my 2-commit ancestry-path "..." series,
but no longer depends on it due to the new way the BOTTOM flag
is initialised. But they both touch the t6019 test, so
applying this on top will avoid conflicts.
Junio C Hamano (2):
t6111: allow checking the parents as well
t6012: update test for tweaked full-history traversal
Kevin Bracey (13):
decorate.c: compact table when growing
t6019: test file dropped in -s ours merge
t6111: new TREESAME test set
t6111: add parents to tests
rev-list-options.txt: correct TREESAME for P
Documentation: avoid "uninteresting"
revision.c: Make --full-history consider more merges
simplify-merges: never remove all TREESAME parents
simplify-merges: drop merge from irrelevant side branch
revision.c: add BOTTOM flag for commits
revision.c: discount side branches when computing TREESAME
revision.c: don't show all merges for --parents
revision.c: make default history consider bottom commits
Documentation/rev-list-options.txt | 42 +--
decorate.c | 2 +-
revision.c | 539 ++++++++++++++++++++++++++++++++-----
revision.h | 4 +-
t/t6012-rev-list-simplify.sh | 31 ++-
t/t6019-rev-list-ancestry-path.sh | 27 ++
t/t6111-rev-list-treesame.sh | 196 ++++++++++++++
7 files changed, 750 insertions(+), 91 deletions(-)
create mode 100755 t/t6111-rev-list-treesame.sh
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html