From: David Turner <dturner@twopensource.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Lukas Fleischer <lfleischer@lfos.de>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v7 00/11] refs backend pre-vtable
Date: Mon, 09 Nov 2015 16:28:21 -0500 [thread overview]
Message-ID: <1447104501.20147.3.camel@twopensource.com> (raw)
In-Reply-To: <cover.1447085798.git.mhagger@alum.mit.edu>
On Mon, 2015-11-09 at 18:03 +0100, Michael Haggerty wrote:
> This is another reroll of the pre-vtable part of the refs-backend
> patch series dt/refs-backend-pre-vtable. v6 [1] proved cumbersome
> because it conflicted messily with lf/ref-is-hidden-namespace [2]. The
> conflicts were partly due to the motion of code across files but, even
> worse, due to the change of order of function definitions between old
> and new files.
>
> So I have heavily "optimized" this reroll for reviewability and to
> minimize conflicts with other work in the area. The only such work
> that I know of is lf/ref-is-hidden-namespace, which can now be merged
> with this series *without conflicts*.
Modulo Ramsey's comments, this works for me. AIUI, Ronnie's original
patchset was written the way it was to avoid merge conflicts. Because
of the changes in the interim, it turns out not to quite work that way.
So it's totally OK with me to write it this new way.
prev parent reply other threads:[~2015-11-09 21:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-09 17:03 [PATCH v7 00/11] refs backend pre-vtable Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 01/11] refs: make is_branch public Michael Haggerty
2015-11-09 18:54 ` Ramsay Jones
2015-11-09 21:22 ` David Turner
2015-11-10 7:37 ` Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 02/11] verify_refname_available(): rename function Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 03/11] verify_refname_available(): new function Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 04/11] copy_msg(): rename to copy_reflog_msg() Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 05/11] pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref() Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 06/11] refname_is_safe(): improve docstring Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 07/11] refs/refs-internal.h: new header file Michael Haggerty
2015-11-09 19:46 ` Ramsay Jones
2015-11-09 21:23 ` David Turner
2015-11-10 7:40 ` Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 09/11] initdb: make safe_create_dir public Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 10/11] files_log_ref_write: new function Michael Haggerty
2015-11-09 17:03 ` [PATCH v7 11/11] refs: break out ref conflict checks Michael Haggerty
2015-11-09 21:28 ` David Turner [this message]
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=1447104501.20147.3.camel@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=lfleischer@lfos.de \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=ronniesahlberg@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).