git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>,
	Michael Haggerty <mhagger@alum.mit.edu>,
	Johan Herland <johan@herland.net>
Subject: Re: [PATCH v6 1/2] worktrees: add find_shared_symref
Date: Mon, 10 Aug 2015 18:42:06 -0400	[thread overview]
Message-ID: <1439246526.5283.3.camel@twopensource.com> (raw)
In-Reply-To: <CAPig+cTBLx2Q0n2ZcA-QgwNQMHZm9G45ThHbGc+Orkz-6c5cUg@mail.gmail.com>

On Mon, 2015-08-10 at 18:30 -0400, Eric Sunshine wrote:
> On Mon, Aug 10, 2015 at 1:52 PM, David Turner <dturner@twopensource.com> wrote:
> > worktrees: add find_shared_symref
> 
> s/worktrees/branch/ perhaps?

Do you mean "this is in branch.c, so should be labeled with branch"?  

Because this change is mostly about non-branch refs, so I think saying
"branch" is confusing.  That's why I labelled it "worktrees"; that's the
broad topic that's being addressed.

> > Add a new function, find_shared_symref, which contains the heart of
> > die_if_checked_out, but works for any symref, not just HEAD.  Refactor
> > die_if_checked_out to use the same infrastructure as
> > find_shared_symref.
> >
> > Soon, we will use find_shared_symref to protect notes merges in
> > worktrees.
> >
> > Signed-off-by: David Turner <dturner@twopensource.com>
> > ---
> > This version addresses Eric Sunshine's comments on v5.  It fixes an error
> > message and cleans up the code.
> 
> All issues identified in previous versions seem to have been
> addressed, and nothing else pops out at me. Thanks.

  reply	other threads:[~2015-08-10 22:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-10 17:52 [PATCH v6 1/2] worktrees: add find_shared_symref David Turner
2015-08-10 17:52 ` [PATCH v6 2/2] notes: handle multiple worktrees David Turner
2015-08-11 13:56   ` Johan Herland
2015-08-10 22:30 ` [PATCH v6 1/2] worktrees: add find_shared_symref Eric Sunshine
2015-08-10 22:42   ` David Turner [this message]
2015-08-10 22:49     ` Eric Sunshine

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=1439246526.5283.3.camel@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=johan@herland.net \
    --cc=mhagger@alum.mit.edu \
    --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 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).