Re: [PATCH v2] notes: handle multiple worktrees

2015-07-31 Thread Junio C Hamano
David Turner writes: > I further propose to add some patches (to go on top of the pseudorefs > series): > > (a) include worktree-refs/ in per_worktree_refs and include > worktree-refs/ in per_worktree_refs in common_list, and Do you mean .git/worktree-refs/, just next to .git/refs? Then I think

Re: [PATCH v2] notes: handle multiple worktrees

2015-07-31 Thread David Turner
On Fri, 2015-07-31 at 11:46 -0700, Junio C Hamano wrote: > David Turner writes: > > > Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using > > die_if_shared_symref. This prevents simultaneous merges to the same > > notes branch from different worktrees. > > > > Signed-off-by: David Turne

Re: [PATCH v2] notes: handle multiple worktrees

2015-07-31 Thread Junio C Hamano
David Turner writes: > Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using > die_if_shared_symref. This prevents simultaneous merges to the same > notes branch from different worktrees. > > Signed-off-by: David Turner > --- > > This version addresses Eric Sunshine's critiques of v1. I

[PATCH v2] notes: handle multiple worktrees

2015-07-31 Thread David Turner
Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using die_if_shared_symref. This prevents simultaneous merges to the same notes branch from different worktrees. Signed-off-by: David Turner --- This version addresses Eric Sunshine's critiques of v1. It breaks out the symref-checking func