From: Johan Herland <johan@herland.net>
To: David Turner <dturner@twopensource.com>
Cc: Git mailing list <git@vger.kernel.org>,
Michael Haggerty <mhagger@alum.mit.edu>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v6 2/2] notes: handle multiple worktrees
Date: Tue, 11 Aug 2015 15:56:45 +0200 [thread overview]
Message-ID: <CALKQrgco6wJ0CpNX5=DF+Z7G009e0G5wz=UUTOqAzv81hKh7bg@mail.gmail.com> (raw)
In-Reply-To: <1439229165-25773-2-git-send-email-dturner@twopensource.com>
On Mon, Aug 10, 2015 at 7:52 PM, David Turner <dturner@twopensource.com> wrote:
> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using
> find_shared_symref and die if we find one. This prevents simultaneous
> merges to the same notes branch from different worktrees.
>
> Signed-off-by: David Turner <dturner@twopensource.com>
Still looks good to me, AFAICS. Feel free to add my Reviewed-by.
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
next prev parent reply other threads:[~2015-08-11 14:20 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 [this message]
2015-08-10 22:30 ` [PATCH v6 1/2] worktrees: add find_shared_symref Eric Sunshine
2015-08-10 22:42 ` David Turner
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='CALKQrgco6wJ0CpNX5=DF+Z7G009e0G5wz=UUTOqAzv81hKh7bg@mail.gmail.com' \
--to=johan@herland.net \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--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).