From: Ben Peart <Ben.Peart@microsoft.com>
To: "peartben@gmail.com" <peartben@gmail.com>
Cc: Ben Peart <Ben.Peart@microsoft.com>,
"git@vger.kernel.org" <git@vger.kernel.org>,
Kevin Willford <kewillf@microsoft.com>,
"newren@gmail.com" <newren@gmail.com>
Subject: [PATCH v2 1/2] t3507: add a testcase showing failure with sparse checkout
Date: Fri, 27 Jul 2018 12:59:42 +0000 [thread overview]
Message-ID: <20180727125923.11744-2-benpeart@microsoft.com> (raw)
In-Reply-To: <20180727125923.11744-1-benpeart@microsoft.com>
From: Ben Peart <peartben@gmail.com>
Recent changes in merge_content() induced a bug when merging files that are
not present in the local working directory due to sparse-checkout. Add a
test case to demonstrate the bug so that we can ensure the fix resolves
it and to prevent future regressions.
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
---
t/t3507-cherry-pick-conflict.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 7c5ad08626..45ddd81bfa 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -392,4 +392,17 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
test_cmp expect actual
'
+test_expect_failure 'cherry-pick preserves sparse-checkout' '
+ pristine_detach initial &&
+ test_config core.sparseCheckout true &&
+ test_when_finished "
+ echo \"/*\" >.git/info/sparse-checkout
+ git read-tree --reset -u HEAD
+ rm .git/info/sparse-checkout" &&
+ echo /unrelated >.git/info/sparse-checkout &&
+ git read-tree --reset -u HEAD &&
+ test_must_fail git cherry-pick -Xours picked>actual &&
+ test_i18ngrep ! "Changes not staged for commit:" actual
+'
+
test_done
--
2.17.0.gvfs.1.123.g449c066
next prev parent reply other threads:[~2018-07-27 12:59 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
2018-07-27 12:59 ` [PATCH v2 0/2] Preserve skip_worktree bit in merges " Ben Peart
2018-07-27 12:59 ` Ben Peart [this message]
2018-07-27 12:59 ` [PATCH v2 2/2] merge-recursive: preserve skip_worktree bit " 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=20180727125923.11744-2-benpeart@microsoft.com \
--to=ben.peart@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.