On 7/20/2018 7:02 PM, Elijah Newren wrote:
On Fri, Jul 20, 2018 at 3:05 PM, Junio C Hamano wrote:
Elijah Newren writes:
Ah, okay, that's helpful. So, if there are conflicts, it should be
free to clear the skip_worktree flag. Since merge-recursive calls
add_cacheinfo() for all entries it
On Fri, Jul 20, 2018 at 3:05 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> Ah, okay, that's helpful. So, if there are conflicts, it should be
>> free to clear the skip_worktree flag. Since merge-recursive calls
>> add_cacheinfo() for all entries it needs to update, which deletes the
>>
Elijah Newren writes:
> Ah, okay, that's helpful. So, if there are conflicts, it should be
> free to clear the skip_worktree flag. Since merge-recursive calls
> add_cacheinfo() for all entries it needs to update, which deletes the
> old cache entry and just makes new ones, we get that for free.
On Fri, Jul 20, 2018 at 2:13 PM, Junio C Hamano wrote:
> Elijah Newren writes:
>
>> But that brings up another interesting question. What if a merge
>> *does* modify a file for which you have skip-worktree set?
>> Previously, it'd clear the bit and write the file to the working tree,
>> but that
Elijah Newren writes:
> But that brings up another interesting question. What if a merge
> *does* modify a file for which you have skip-worktree set?
> Previously, it'd clear the bit and write the file to the working tree,
> but that was by no means an explicit decision;
At least in my mind, th
On Fri, Jul 20, 2018 at 12:53 PM, Ben Peart wrote:
> As we were attempting to migrate to 2.18 some of our internal functional
> tests failed. The tests that failed were testing merge and cherry-pick when
> there was a merge conflict. Our tests run with sparse-checkout enabled which
> is what expo
As we were attempting to migrate to 2.18 some of our internal functional
tests failed. The tests that failed were testing merge and cherry-pick
when there was a merge conflict. Our tests run with sparse-checkout
enabled which is what exposed the bug.
What is happening is that in merge_recursi
7 matches
Mail list logo
