Re: [PATCH v6 2/2] notes: handle multiple worktrees

On Mon, Aug 10, 2015 at 7:52 PM, David Turner 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 Still looks goo

[PATCH v6 2/2] notes: handle multiple worktrees

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 --- builtin/notes.c | 6 t/t3320-notes-merge-worktrees.