From: Sergey Organov <sorganov@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v3 4/4] t3506: validate '-m 1 -ff' is now accepted for non-merge commits
Date: Fri, 14 Dec 2018 07:53:51 +0300 [thread overview]
Message-ID: <7a93e62dd12bd890ea13c7b3dd483ed4bafcf642.1546789304.git.sorganov@gmail.com> (raw)
In-Reply-To: <cover.1546789223.git.sorganov@gmail.com>
Signed-off-by: Sergey Organov <sorganov@gmail.com>
---
t/t3506-cherry-pick-ff.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh
index fb889ac..127dd00 100755
--- a/t/t3506-cherry-pick-ff.sh
+++ b/t/t3506-cherry-pick-ff.sh
@@ -64,10 +64,10 @@ test_expect_success 'merge setup' '
git checkout -b new A
'
-test_expect_success 'cherry-pick a non-merge with --ff and -m should fail' '
+test_expect_success 'cherry-pick explicit first parent of a non-merge with --ff' '
git reset --hard A -- &&
- test_must_fail git cherry-pick --ff -m 1 B &&
- git diff --exit-code A --
+ git cherry-pick --ff -m 1 B &&
+ git diff --exit-code C --
'
test_expect_success 'cherry pick a merge with --ff but without -m should fail' '
--
2.10.0.1.g57b01a3
next prev parent reply other threads:[~2019-01-06 15:50 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-25 12:42 [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov
2018-06-21 15:54 ` Junio C Hamano
2018-06-22 9:16 ` Sergey Organov
2018-12-12 5:35 ` Sergey Organov
2018-12-13 4:20 ` Junio C Hamano
2018-12-13 6:35 ` Sergey Organov
2018-12-13 15:35 ` Sergey Organov
2018-12-14 2:36 ` Junio C Hamano
2018-12-14 4:39 ` [PATCH v2 0/4] Allow 'cherry-pick -m 1' for non-merge commits Sergey Organov
2018-12-14 4:53 ` [PATCH v2 2/4] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov
2018-12-14 4:53 ` [PATCH v2 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks Sergey Organov
2018-12-14 4:53 ` [PATCH v2 3/4] t3502: validate '-m 1' argument is now accepted for non-merge commits Sergey Organov
2019-01-03 17:22 ` SZEDER Gábor
2019-01-06 14:41 ` Sergey Organov
2018-12-14 4:53 ` [PATCH v2 4/4] t3506: validate '-m 1 -ff' " Sergey Organov
2018-12-25 12:39 ` [PATCH v2 0/4] Allow 'cherry-pick -m 1' " Sergey Organov, Sergey Organov
2018-12-26 22:52 ` Junio C Hamano
2018-12-29 9:10 ` Sergey Organov
2018-12-14 4:39 ` [PATCH v3 " Sergey Organov
2018-12-14 4:53 ` [PATCH v3 2/4] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov
2018-12-14 4:53 ` [PATCH v3 1/4] t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks Sergey Organov
2018-12-14 4:53 ` [PATCH v3 3/4] t3502: validate '-m 1' argument is now accepted for non-merge commits Sergey Organov
2018-12-14 4:53 ` Sergey Organov [this message]
2019-03-19 11:29 ` [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified Sergey Organov
2019-03-20 0:38 ` Junio C Hamano
2019-03-20 5:09 ` Jeff King
2019-03-25 6:43 ` Sergey Organov
2019-03-26 16:32 ` Jeff King
2019-03-26 22:07 ` Elijah Newren
2019-03-26 22:20 ` Jeff King
2019-03-27 0:33 ` Elijah Newren
2019-03-27 13:54 ` Sergey Organov
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=7a93e62dd12bd890ea13c7b3dd483ed4bafcf642.1546789304.git.sorganov@gmail.com \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--subject='Re: [PATCH v3 4/4] t3506: validate '\''-m 1 -ff'\'' is now accepted for non-merge commits' \
/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
Code repositories for project(s) associated with this 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).