New version - nothing much changed since v2.2, except the new test
set to illustrate and prove the changes. Not sure about the t6111
numbering - there wasn't space where I really wanted to put it.
And maybe it should be appended to one of the existing tests.
You will note that I'm floundering for the name for the commits I care
about in part 9. Currently at "priority", but that's horrible, not least
because it isn't an adjective. I think the word I really want is
"interesting", but that's already taken... "Relevant", "important"?
Junio C Hamano (1):
t6012: update test for tweaked full-history traversal
Kevin Bracey (8):
decorate.c: compact table when growing
t6019: test file dropped in -s ours merge
t6111: new TREESAME test set
rev-list-options.txt: correct TREESAME for P
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: discount side branches when computing TREESAME
Documentation/rev-list-options.txt | 38 +--
decorate.c | 2 +-
revision.c | 511 +++++++++++++++++++++++++++++++++----
revision.h | 4 +-
t/t6012-rev-list-simplify.sh | 31 ++-
t/t6019-rev-list-ancestry-path.sh | 29 ++-
t/t6111-rev-list-treesame.sh | 180 +++++++++++++
7 files changed, 723 insertions(+), 72 deletions(-)
create mode 100755 t/t6111-rev-list-treesame.sh
--
1.8.3.rc0.28.g682c2d9