From: Junio C Hamano <gitster@pobox.com>
To: Kacper Kornet <draenog@pld-linux.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2] Fix revision walk for commits with the same dates
Date: Fri, 22 Mar 2013 13:45:47 -0700 [thread overview]
Message-ID: <7va9pv6u4k.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130322183819.GA18210@camk.edu.pl> (Kacper Kornet's message of "Fri, 22 Mar 2013 19:38:19 +0100")
Kacper Kornet <draenog@pld-linux.org> writes:
> Logic in still_interesting function allows to stop the commits
> traversing if the oldest processed commit is not older then the
> youngest commit on the list to process and the list contains only
> commits marked as not interesting ones. It can be premature when dealing
> with a set of coequal commits. For example git rev-list A^! --not B
> provides wrong answer if all commits in the range A..B had the same
> commit time and there are more then 7 of them.
>
> To fix this problem the relevant part of the logic in still_interesting
> is changed to: the walk can be stopped if the oldest processed commit is
> younger then the youngest commit on the list to processed.
Is the made-up test case to freeze the clock even interesting? The
slop logic is merely a heuristic to compensate for effects caused by
skewed or non-monototic clocks, so in a different repository you may
even need to fuzz the timestamp comparison further
if (date - 10 < src->item->date)
or something silly like that.
> Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
> ---
>
> I don't know whether the first version was overlooked or deemed as not
> worthy. So just in case I resend it. Changes since the first version:
>
> 1. The test has been added
> 2. The commit log has been rewritten
>
>
> revision.c | 2 +-
> t/t6009-rev-list-parent.sh | 13 +++++++++++++
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
> diff --git a/revision.c b/revision.c
> index ef60205..cf620c6 100644
> --- a/revision.c
> +++ b/revision.c
> @@ -709,7 +709,7 @@ static int still_interesting(struct commit_list *src, unsigned long date, int sl
> * Does the destination list contain entries with a date
> * before the source list? Definitely _not_ done.
> */
> - if (date < src->item->date)
> + if (date <= src->item->date)
> return SLOP;
>
> /*
> diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
> index 3050740..66cda17 100755
> --- a/t/t6009-rev-list-parent.sh
> +++ b/t/t6009-rev-list-parent.sh
> @@ -133,4 +133,17 @@ test_expect_success 'dodecapus' '
> check_revlist "--min-parents=13" &&
> check_revlist "--min-parents=4 --max-parents=11" tetrapus
> '
> +
> +test_expect_success 'ancestors with the same commit time' '
> +
> + test_tick_keep=$test_tick &&
> + for i in 1 2 3 4 5 6 7 8; do
> + test_tick=$test_tick_keep
> + test_commit t$i
> + done &&
> + git rev-list t1^! --not t$i >result &&
> + >expect &&
> + test_cmp expect result
> +'
> +
> test_done
> --
> 1.8.2
next prev parent reply other threads:[~2013-03-22 20:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 18:03 [PATCH] Fix revision walk for commits with the same dates Kacper Kornet
2013-03-22 18:38 ` [PATCH v2] " Kacper Kornet
2013-03-22 20:45 ` Junio C Hamano [this message]
2013-03-22 21:07 ` Kacper Kornet
2013-03-24 2:18 ` Eric Sunshine
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=7va9pv6u4k.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=draenog@pld-linux.org \
--cc=git@vger.kernel.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).