From: Junio C Hamano <gitster@pobox.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Johan Herland <johan@herland.net>,
David Turner <dturner@twopensource.com>,
Git mailing list <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Philip Oakley <philipoakley@iee.org>
Subject: Re: [PATCH v3 2/6] notes: replace pseudorefs with real refs
Date: Tue, 28 Jul 2015 19:00:08 -0700 [thread overview]
Message-ID: <xmqqh9onbu53.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <55B824BD.8000003@alum.mit.edu> (Michael Haggerty's message of "Wed, 29 Jul 2015 02:56:29 +0200")
Michael Haggerty <mhagger@alum.mit.edu> writes:
> It sounds like what a notes merge really wants is a new linked worktree
> that has branch refs/notes/foo checked out:
>
> * This would allow multiple notes merges to take place at the same time
> provided they target different merge references.
>
> * This would prevent multiple notes merges to the same notes reference
> at the same time by the same mechanism that prevents the same branch
> from being checked out in two linked worktrees at the same time.
>
> It's just a thought; I have no idea whether it is practical...
That was certainly one of the possibilities that crossed my mind.
In any case, the primary thing I am interested in at this point is
to unblock David's "prepare things so that we can put primary refs
in a different ref backends more easily" topic, and I've already
made my point a few messages ago upstream:
I think it is OK for us to admit that the "notes" subsystem is
not quite ready to work well with multiple working tree world
yet [*1*], and move this series forward without worrying about
them.
So doing the absolute minimum, leaving the "now what can we do to
improve notes-merge process?" outside the scope of the topic.
Improving the notes-merge process is also an interesting topic, but
it is clear that people started thinking about it today ;-), so it
can wait without blocking David's work. The refs/notes/* hierarchy
will be handled exactly the same way as regular branches in the
pluggable ref-backends, and how the ephemeral REF_NOTES_REF and
friends are represented (some are refs, some may be pseudo-refs,
some may be just a filesystem entity) would need to be revamped if
we really do the "improving notes-merge" thing anyway, so David's
topic shouldn't be blocked by the "possible future tweak" of the
current design that hasn't happened yet. Instead, improving
notes-merge can be done on top, potentially undoing and redoing
Davi'd topic.
next prev parent reply other threads:[~2015-07-29 2:00 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 18:12 [PATCH v3 0/6] pseudorefs David Turner
2015-07-28 18:12 ` [PATCH v3 1/6] refs: Introduce pseudoref and per-worktree ref concepts David Turner
2015-07-28 18:12 ` [PATCH v3 2/6] notes: replace pseudorefs with real refs David Turner
2015-07-28 19:00 ` Junio C Hamano
2015-07-28 19:24 ` David Turner
2015-07-28 19:44 ` Junio C Hamano
2015-07-28 21:23 ` [PATCH] notes: handle multiple worktrees David Turner
2015-07-28 21:42 ` David Turner
2015-07-28 22:00 ` Junio C Hamano
2015-07-28 22:12 ` Junio C Hamano
2015-07-28 22:50 ` Johan Herland
2015-08-03 13:27 ` Duy Nguyen
2015-07-28 22:17 ` Eric Sunshine
2015-07-28 22:38 ` [PATCH v3 2/6] notes: replace pseudorefs with real refs Johan Herland
2015-07-28 22:52 ` Junio C Hamano
2015-07-28 23:43 ` Johan Herland
2015-07-29 0:33 ` Junio C Hamano
2015-07-29 0:56 ` Michael Haggerty
2015-07-29 1:23 ` Jacob Keller
2015-07-29 1:24 ` Johan Herland
2015-07-29 2:25 ` Junio C Hamano
2015-07-29 2:00 ` Junio C Hamano [this message]
2015-07-29 2:53 ` Johan Herland
2015-07-29 5:00 ` Junio C Hamano
2015-07-29 2:34 ` Johan Herland
2015-07-29 5:01 ` Junio C Hamano
2015-07-29 13:19 ` Johan Herland
2015-07-29 16:37 ` Junio C Hamano
2015-07-29 16:58 ` Junio C Hamano
2015-07-30 6:05 ` Johan Herland
2015-07-30 16:24 ` Junio C Hamano
2015-07-29 2:17 ` Junio C Hamano
2015-07-29 2:37 ` Johan Herland
2015-07-28 18:12 ` [PATCH v3 3/6] refs: add ref_type function David Turner
2015-07-29 6:32 ` Eric Sunshine
2015-07-28 18:12 ` [PATCH v3 4/6] pseudorefs: create and use pseudoref update and delete functions David Turner
2015-07-29 6:38 ` Eric Sunshine
2015-07-28 18:12 ` [PATCH v3 5/6] rebase: use update_ref David Turner
2015-07-28 18:12 ` [PATCH v3 6/6] sequencer: replace write_cherry_pick_head with update_ref David Turner
2015-07-28 19:01 ` [PATCH v3 0/6] pseudorefs Junio C Hamano
2015-07-28 19:07 ` David Turner
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=xmqqh9onbu53.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=mhagger@alum.mit.edu \
--cc=philipoakley@iee.org \
--cc=sunshine@sunshineco.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.