Re: [PATCH v6 1/2] worktrees: add find_shared_symref

From: David Turner <dturner@twopensource.com>
Date: Aug 10, 2015, 22:42 UTC
Message-ID: <1439246526.5283.3.camel@twopensource.com>
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.

Show 15 quoted lines

> > 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.