From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, martin.agren@gmail.com
Subject: Re: What's cooking in git.git (Feb 2020, #01; Wed, 5)
Date: Wed, 5 Feb 2020 18:51:30 -0800 [thread overview]
Message-ID: <20200206025130.GA22748@syl.local> (raw)
In-Reply-To: <xmqqpnesfw74.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, Feb 05, 2020 at 03:31:11PM -0800, Junio C Hamano wrote:
> * tb/commit-graph-object-dir (2020-02-04) 5 commits
> - commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
> - commit-graph.c: remove path normalization, comparison
> - commit-graph.h: store object directory in 'struct commit_graph'
> - commit-graph.h: store an odb in 'struct write_commit_graph_context'
> - t5318: don't pass non-object directory to '--object-dir'
> (this branch is used by tb/commit-graph-split-merge.)
>
> The code to compute the commit-graph has been taught to use a more
> robust way to tell if two object directories refer to the same
> thing.
>
> Will merge to 'next'.
This topic is ready to go. We've been using this at GitHub for a few
days without any issue, but we weren't users of '--object-dir' to begin
with, so take our usage with a grain of salt, I suppose :-).
> * tb/commit-graph-split-merge (2020-02-05) 3 commits
> - builtin/commit-graph.c: support '--input=none'
> - builtin/commit-graph.c: introduce '--input=<source>'
> - builtin/commit-graph.c: support '--split[=<strategy>]'
> (this branch uses tb/commit-graph-object-dir.)
>
> The code to write out the commit-graph has been taught a few
> options to control if the resulting graph chains should be merged
> or a single new incremental graph is created.
>
> Will merge to 'next'?
I think that this is ready. Martin Ågren and I discussed a little bit
about the rationale behind why the new options were chosen over
alternatives, but I think we reached consensus (at least, the thread has
been quiet for a few days after sending 'v2').
So, if you're asking whether or not this is ready to merge to 'next',
I'd say that it is, but I'd like to hear from Martin's thoughts, too.
(For what it's worth, we're *also* running this at GitHub, and without
issue).
Thanks,
Taylor
next prev parent reply other threads:[~2020-02-06 2:51 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 23:31 What's cooking in git.git (Feb 2020, #01; Wed, 5) Junio C Hamano
2020-02-06 1:32 ` Elijah Newren
2020-02-06 21:05 ` Phillip Wood
2020-02-06 2:51 ` Taylor Blau [this message]
2020-02-06 8:57 ` SZEDER Gábor
2020-02-06 17:48 ` Taylor Blau
2020-02-06 19:58 ` Martin Ågren
2020-02-10 19:56 ` Taylor Blau
2020-02-06 20:56 ` Martin Ågren
2020-02-07 6:42 ` Christian Couder
2020-02-07 12:45 ` Jeff King
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=20200206025130.GA22748@syl.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
/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).