From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Ben Peart <peartben@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
Kevin Willford <kewillf@microsoft.com>,
Ben Peart <benpeart@microsoft.com>
Subject: Re: [BUG] merge-recursive overly aggressive when skipping updating the working tree
Date: Fri, 20 Jul 2018 14:13:06 -0700 [thread overview]
Message-ID: <xmqqsh4da9wd.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BF+Vx8YT2KAJQ+szbkYExv-_o5E-ZkywgvzsHWR0QvVEg@mail.gmail.com> (Elijah Newren's message of "Fri, 20 Jul 2018 13:48:37 -0700")
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?
next prev parent reply other threads:[~2018-07-20 21:13 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 19:53 [BUG] merge-recursive overly aggressive when skipping updating the working tree Ben Peart
2018-07-20 20:48 ` Elijah Newren
2018-07-20 21:13 ` Junio C Hamano [this message]
2018-07-20 21:42 ` Elijah Newren
2018-07-20 22:05 ` Junio C Hamano
2018-07-20 23:02 ` Elijah Newren
2018-07-23 12:49 ` Ben Peart
2018-07-21 6:34 ` [PATCH 0/2] Preserve skip_worktree bit in merges when necessary Elijah Newren
2018-07-21 6:34 ` [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout Elijah Newren
2018-07-21 7:21 ` Eric Sunshine
2018-07-23 13:12 ` Ben Peart
2018-07-23 18:09 ` Eric Sunshine
2018-07-23 18:22 ` Ben Peart
2018-07-21 13:02 ` Ben Peart
2018-07-23 18:12 ` Junio C Hamano
2018-07-21 6:34 ` [PATCH 2/2] merge-recursive: preserve skip_worktree bit when necessary Elijah Newren
2018-07-23 14:14 ` Ben Peart
2018-07-27 12:59 ` [PATCH v2 0/2] Preserve skip_worktree bit in merges " Ben Peart
2018-07-27 12:59 ` [PATCH v2 1/2] t3507: add a testcase showing failure with sparse checkout Ben Peart
2018-07-27 12:59 ` [PATCH v2 2/2] merge-recursive: preserve skip_worktree bit when necessary Ben Peart
2018-07-27 18:14 ` [PATCH v2 0/2] Preserve skip_worktree bit in merges " Junio C Hamano
2018-07-31 16:11 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsh4da9wd.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=kewillf@microsoft.com \
--cc=newren@gmail.com \
--cc=peartben@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.