From: Jakub Narebski <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Derrick Stolee <dstolee@microsoft.com>
Subject: Re: What's cooking in git.git (Aug 2018, #01; Thu, 2)
Date: Tue, 07 Aug 2018 12:50:06 +0200 [thread overview]
Message-ID: <86effapi1t.fsf@gmail.com> (raw)
In-Reply-To: <xmqq4lgcz81f.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Thu, 02 Aug 2018 16:02:36 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> * ds/commit-graph-with-grafts (2018-07-19) 8 commits
> (merged to 'next' on 2018-08-02 at 0ee624e329)
> + commit-graph: close_commit_graph before shallow walk
> + commit-graph: not compatible with uninitialized repo
> + commit-graph: not compatible with grafts
> + commit-graph: not compatible with replace objects
> + test-repository: properly init repo
> + commit-graph: update design document
> + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
> + refs.c: migrate internal ref iteration to pass thru repository argument
>
> The recently introduced commit-graph auxiliary data is incompatible
> with mechanisms such as replace & grafts that "breaks" immutable
> nature of the object reference relationship. Disable optimizations
> based on its use (and updating existing commit-graph) when these
> incompatible features are in use in the repository.
>
> Will merge to 'master'.
Derrick wrote that he will be sending v2 of this patch series in a few
weeks, among others to make it use commit-graph feature if replace
objects are present but not used (as some git hosting services do, see
core.useReplaceRefs below).
Also, the test for interaction of commit-graph with the grafts file
feature does not actually test grafts, but replace objects.
> * jk/core-use-replace-refs (2018-07-18) 3 commits
> (merged to 'next' on 2018-08-02 at 90fb6b1056)
> + add core.usereplacerefs config option
> + check_replace_refs: rename to read_replace_refs
> + check_replace_refs: fix outdated comment
>
> A new configuration variable core.usereplacerefs has been added,
> primarily to help server installations that want to ignore the
> replace mechanism altogether.
>
> Will merge to 'master'.
Nice to have features used in the wild merged into core git.
--
Jakub Narębski
next prev parent reply other threads:[~2018-08-07 10:50 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 23:02 What's cooking in git.git (Aug 2018, #01; Thu, 2) Junio C Hamano
2018-08-03 0:05 ` Stefan Beller
2018-08-03 16:08 ` Junio C Hamano
2018-08-03 3:00 ` Pratik Karki
2018-08-03 16:09 ` Junio C Hamano
2018-08-03 18:09 ` brian m. carlson
2018-08-03 18:40 ` Junio C Hamano
2018-08-03 18:45 ` brian m. carlson
2018-08-03 18:51 ` Junio C Hamano
2018-08-03 18:56 ` Junio C Hamano
2018-08-03 19:32 ` Brandon Williams
2018-08-03 20:07 ` Junio C Hamano
2018-08-03 20:43 ` Stefan Beller
2018-08-03 21:45 ` Junio C Hamano
2018-08-05 6:15 ` Junio C Hamano
2018-08-05 0:30 ` pk/rebase-in-c, was " Johannes Schindelin
2018-08-05 6:08 ` Junio C Hamano
2018-08-09 13:24 ` Johannes Schindelin
2018-08-07 10:50 ` Jakub Narebski [this message]
2018-08-07 14:36 ` Junio C Hamano
2018-08-07 15:42 ` Jakub Narębski
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=86effapi1t.fsf@gmail.com \
--to=jnareb@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.