On Wed, Jul 29, 2015 at 5:50 AM, Johan Herland wrote:
> On Wed, Jul 29, 2015 at 12:12 AM, Junio C Hamano wrote:
>> David Turner writes:
>>> Prevent merges to the same notes branch from different worktrees.
>>> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
>>> code we use
On Wed, Jul 29, 2015 at 12:12 AM, Junio C Hamano wrote:
> David Turner writes:
>> Prevent merges to the same notes branch from different worktrees.
>> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
>> code we use to check that two HEADs in different worktrees don't point
>>
On Tue, Jul 28, 2015 at 5:23 PM, David Turner wrote:
> Prevent merges to the same notes branch from different worktrees.
> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
> code we use to check that two HEADs in different worktrees don't point
> to the same branch. Modify th
David Turner writes:
> Prevent merges to the same notes branch from different worktrees.
> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
> code we use to check that two HEADs in different worktrees don't point
> to the same branch. Modify that code, die_if_checked_out, to
David Turner writes:
> Sorry, this one is on top of next.
Thanks, but I'd appreciate if you can be more specific next time.
A topic that truly depends on everything in 'next' cannot graduate
before all the others do, but in this particular case, I think this
change only needs to depend on Eric'
Sorry, this one is on top of next.
On Tue, 2015-07-28 at 17:23 -0400, David Turner wrote:
> Prevent merges to the same notes branch from different worktrees.
> Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
> code we use to check that two HEADs in different worktrees don't p
Prevent merges to the same notes branch from different worktrees.
Before creating NOTES_MERGE_REF, check NOTES_MERGE_REF using the same
code we use to check that two HEADs in different worktrees don't point
to the same branch. Modify that code, die_if_checked_out, to take a
"head" ref to examine;
7 matches
Mail list logo