From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 Jul 2018 21:13:06 GMT
Subject: Re: [BUG] merge-recursive overly aggressive when skipping updating the working tree
Message-ID: <xmqqsh4da9wd.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BF+Vx8YT2KAJQ+szbkYExv-_o5E-ZkywgvzsHWR0QvVEg@mail.gmail.com>

Elijah Newren <newren@gmail.com> 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, the "skip worktree" aka sparse checkout has
always been "best effort" in that if Git needs to materialize a
working tree file in order to carry out some operation (e.g. a merge
needs conflict resolution, hence we need to give a working tree file
with conflict markers to the end user) Git is free to do so.

Isn't that what happens currently?