From: Kevin Bracey <kevin@bracey.fi>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Kevin Bracey <kevin@bracey.fi>
Subject: [PATCH v4 00/15] History traversal refinements
Date: Thu, 16 May 2013 18:32:26 +0300 [thread overview]
Message-ID: <1368718361-27859-1-git-send-email-kevin@bracey.fi> (raw)
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
--
1.8.3.rc0.28.g4b02ef5
next reply other threads:[~2013-05-16 15:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-16 15:32 Kevin Bracey [this message]
2013-05-16 15:32 ` [PATCH v4 01/15] decorate.c: compact table when growing Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 02/15] t6019: test file dropped in -s ours merge Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 03/15] t6111: new TREESAME test set Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 04/15] t6111: allow checking the parents as well Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 05/15] t6111: add parents to tests Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 06/15] rev-list-options.txt: correct TREESAME for P Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 07/15] Documentation: avoid "uninteresting" Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 08/15] revision.c: Make --full-history consider more merges Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 09/15] t6012: update test for tweaked full-history traversal Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 10/15] simplify-merges: never remove all TREESAME parents Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 11/15] simplify-merges: drop merge from irrelevant side branch Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 12/15] revision.c: add BOTTOM flag for commits Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 13/15] revision.c: discount side branches when computing TREESAME Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 14/15] revision.c: don't show all merges for --parents Kevin Bracey
2013-05-16 15:32 ` [PATCH v4 15/15] revision.c: make default history consider bottom commits Kevin Bracey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368718361-27859-1-git-send-email-kevin@bracey.fi \
--to=kevin@bracey.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).