From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, benpeart@microsoft.com, kewillf@microsoft.com,
Ben Peart <peartben@gmail.com>, Elijah Newren <newren@gmail.com>
Subject: [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout
Date: Fri, 20 Jul 2018 23:34:27 -0700 [thread overview]
Message-ID: <20180721063428.20518-2-newren@gmail.com> (raw)
In-Reply-To: <20180721063428.20518-1-newren@gmail.com>
From: Ben Peart <peartben@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Testcase provided by Ben, so committing with him as the author. Just need
a sign off from him.
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 7c5ad0862..25fac490d 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 'failed cherry-pick with 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_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
--
2.18.0.234.g2d1e6cefb
next prev parent reply other threads:[~2018-07-21 6:34 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 ` Elijah Newren [this message]
2018-07-21 7:21 ` [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout 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
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=20180721063428.20518-2-newren@gmail.com \
--to=newren@gmail.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kewillf@microsoft.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.
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).