From: Michael J Gruber <git@drmicha.warpmail.net>
To: Jeff King <peff@peff.net>, Michal Hocko <mhocko@suse.cz>
Cc: git@vger.kernel.org
Subject: Re: git describe --contains doesn't work properly for a commit
Date: Wed, 04 Mar 2015 16:06:17 +0100 [thread overview]
Message-ID: <54F71F69.3080500@drmicha.warpmail.net> (raw)
In-Reply-To: <20150304105408.GA19693@peff.net>
Jeff King venit, vidit, dixit 04.03.2015 11:54:
> On Thu, Feb 26, 2015 at 03:23:14PM +0100, Michal Hocko wrote:
>
>> The commit in the middle was ammended to have committer date in the
>> past.
>> $ git describe --contains d63972e4e4e7eda0444e56739ad09bfbc476b9bd
>> tag~1
>>
>> but
>> $ git describe --contains 108a0d5972fd2e5f25b2f38cfd2fee73031ff9d3
>> fatal: cannot describe '108a0d5972fd2e5f25b2f38cfd2fee73031ff9d3'
>>
>> I guess this is the same issue reported previously here:
>> http://git.661346.n2.nabble.com/git-describe-contains-fails-on-given-tree-td5448286.html
>
> Yes, the "describe --contains" algorithm uses timestamps to cut off the
> traversal, so it can do the wrong thing if there's clock skew. It has a
> "slop" margin of one day, but skew larger than that can fool it.
>
>> Can this be fixed somehow or it would lead to other kind of issues?
>
> The options are basically:
>
> 1. Stop cutting off the traversal based on timestamps. This will make
> the common case of valid timestamps much slower, though, as it will
> have to walk all the way to the roots.
>
> 2. Use a different slop mechanism. For example, keep walking up to 5
> commits past a commit suspected to be past the cutoff. This is
> relatively easy to do (we do it for "--since" checks), and would
> catch your case above. But of course it does not catch all cases of
> skew.
>
> 3. Introduce a more trust-worthy mechanism for ordering commits. The
> timestamp here is really just a proxy for the oft-discussed
> "generation number" of the commit within the graph. We've avoided
> adding generation numbers because of the storage/complexity issues.
Hmmh.
Storage: one int (or maybe less) per commit doesn't sound too bad. We
can probably do without on bare repos by default.
Complexity: Was that due to replace refs? Other than that, it seemed to
be simple: max(parent generation numbers)+1.
... or can reachability bitmaps help???
Michael
next prev parent reply other threads:[~2015-03-04 15:06 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-26 13:35 git describe --contains doesn't work properly for a commit Michal Hocko
2015-02-26 14:23 ` Michal Hocko
2015-03-04 10:54 ` Jeff King
2015-03-04 15:06 ` Michael J Gruber [this message]
2015-03-04 18:05 ` Jeff King
2015-03-04 20:41 ` Junio C Hamano
2015-03-04 22:05 ` Mike Hommey
2015-03-05 5:12 ` Jeff King
2015-03-05 6:00 ` Junio C Hamano
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=54F71F69.3080500@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=mhocko@suse.cz \
--cc=peff@peff.net \
/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