From: Ben Peart <peartben@gmail.com>
To: Elijah Newren <newren@gmail.com>, git@vger.kernel.org
Cc: gitster@pobox.com, benpeart@microsoft.com, kewillf@microsoft.com
Subject: Re: [PATCH 2/2] merge-recursive: preserve skip_worktree bit when necessary
Date: Mon, 23 Jul 2018 10:14:40 -0400 [thread overview]
Message-ID: <75aa297e-4857-d92a-7041-618ff3b0b77a@gmail.com> (raw)
In-Reply-To: <20180721063428.20518-3-newren@gmail.com>
<snip>
> merge-recursive.c | 16 ++++++++++++++++
> t/t3507-cherry-pick-conflict.sh | 2 +-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 113c1d696..fd74bca17 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -3069,10 +3069,26 @@ static int merge_content(struct merge_options *o,
> if (mfi.clean &&
> was_tracked_and_matches(o, path, &mfi.oid, mfi.mode) &&
> !df_conflict_remains) {
> + int pos;
> + struct cache_entry *ce;
> +
> output(o, 3, _("Skipped %s (merged same as existing)"), path);
> if (add_cacheinfo(o, mfi.mode, &mfi.oid, path,
> 0, (!o->call_depth && !is_dirty), 0))
> return -1;
> + /*
> + * However, add_cacheinfo() will delete the old cache entry
> + * and add a new one. We need to copy over any skip_worktree
> + * flag to avoid making the file appear as if it were
> + * deleted by the user.
> + */
nit - I find it a little odd to start a comment with "However" as if you
are continuing a conversation.
> + pos = index_name_pos(&o->orig_index, path, strlen(path));
> + ce = o->orig_index.cache[pos];
> + if (ce_skip_worktree(ce)) {
> + pos = index_name_pos(&the_index, path, strlen(path));
> + ce = the_index.cache[pos];
> + ce->ce_flags |= CE_SKIP_WORKTREE;
> + }
> return mfi.clean;
> }
>
> diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
> index 25fac490d..9b1456a7c 100755
> --- a/t/t3507-cherry-pick-conflict.sh
> +++ b/t/t3507-cherry-pick-conflict.sh
> @@ -392,7 +392,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
> test_cmp expect actual
> '
>
> -test_expect_failure 'failed cherry-pick with sparse-checkout' '
> +test_expect_success 'failed cherry-pick with sparse-checkout' '
> pristine_detach initial &&
> git config core.sparseCheckout true &&
> echo /unrelated >.git/info/sparse-checkout &&
>
Thanks Elijah, I can verify this fixes the problem with the preferred
solution (ie it preserves the skip-worktree bit). As such, this is:
Reviewed-by: Ben Peart <benpeart@microsoft.com>
That said, I would propose the test be updated to include a specific
test for the skip-worktree bit so that if a future patch reverts to the
old behavior of clearing the skip-worktree bit and writing out the file
to the working directory, we do it explicitly instead of by accident.
diff --git a/t/t3507-cherry-pick-conflict.sh
b/t/t3507-cherry-pick-conflict.sh
index 9b1456a7c3..bc8863ff36 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -392,17 +392,17 @@ test_expect_success 'commit --amend -s places the
sign-off at the right place' '
test_cmp expect actual
'
-test_expect_success 'failed cherry-pick with sparse-checkout' '
+test_expect_success 'cherry-pick preserves sparse-checkout' '
pristine_detach initial &&
git config core.sparseCheckout true &&
echo /unrelated >.git/info/sparse-checkout &&
git read-tree --reset -u HEAD &&
test_must_fail git cherry-pick -Xours picked>actual &&
+ test "$(git ls-files -t foo)" = "S foo" &&
test_i18ngrep ! "Changes not staged for commit:" actual &&
echo "/*" >.git/info/sparse-checkout &&
git read-tree --reset -u HEAD &&
git config core.sparseCheckout false &&
rm .git/info/sparse-checkout
'
test_done
next prev parent reply other threads:[~2018-07-23 14:14 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
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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=75aa297e-4857-d92a-7041-618ff3b0b77a@gmail.com \
--to=peartben@gmail.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kewillf@microsoft.com \
--cc=newren@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).