From: Sergey Organov <sorganov@gmail.com>
From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 0/4] Allow 'cherry-pick -m 1' for non-merge commits
Date: Tue, 25 Dec 2018 15:39:55 +0300 [thread overview]
Message-ID: <87tvj1ok4k.fsf@javad.com> (raw)
In-Reply-To: <cover.1544762343.git.sorganov@gmail.com> (Sergey Organov's message of "Fri, 14 Dec 2018 07:39:03 +0300")
Hi Junio,
What's the status of these patches?
Thanks,
-- Sergey
Sergey Organov <sorganov@gmail.com> writes:
> When cherry-picking multiple commits, it's impossible to have both
> merge- and non-merge commits on the same command-line. Not specifying
> '-m 1' results in cherry-pick refusing to handle merge commits, while
> specifying '-m 1' fails on non-merge commits.
>
> This patch series allow '-m 1' for non-merge commits as well as fixes
> relevant tests in accordance.
>
> It also opens the way to making '-m 1' the default, that would be
> inline with the trends to assume first parent to be the mainline in
> most workflows.
>
> Sergey Organov (4):
> t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks
> cherry-pick: do not error on non-merge commits when '-m 1' is
> specified
> t3502: validate '-m 1' argument is now accepted for non-merge commits
> t3506: validate '-m 1 -ff' is now accepted for non-merge commits
>
> sequencer.c | 10 +++++++---
> t/t3502-cherry-pick-merge.sh | 12 ++++++------
> t/t3506-cherry-pick-ff.sh | 6 +++---
> t/t3510-cherry-pick-sequence.sh | 8 ++++++--
> 4 files changed, 22 insertions(+), 14 deletions(-)
next prev parent reply other threads:[~2018-12-25 12:40 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 v3 0/4] Allow 'cherry-pick -m 1' for non-merge commits Sergey Organov
2018-12-14 4:53 ` [PATCH v3 4/4] t3506: validate '-m 1 -ff' is now accepted " 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:39 ` [PATCH v2 0/4] Allow 'cherry-pick -m 1' " 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 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 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 ` Sergey Organov, Sergey Organov [this message]
2018-12-26 22:52 ` [PATCH v2 0/4] Allow 'cherry-pick -m 1' " Junio C Hamano
2018-12-29 9:10 ` Sergey Organov
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=87tvj1ok4k.fsf@javad.com \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).