Git cherry pick a merge commit6/30/2023 Of applying all four patches to find out that the updates are only I checked the overall diff between the previous round and the result Improved relative to the previous round better than whatever answer I am concerned, and its cover letter would have described what's The status of these patches is "Just updated on the list", as far as > Hi Junio, > What's the status of these patches? > 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(-) > 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. > This patch series allow '-m 1' for non-merge commits as well as fixes > relevant tests in accordance. Not specifying > '-m 1' results in cherry-pick refusing to handle merge commits, while > specifying '-m 1' fails on non-merge commits. > When cherry-picking multiple commits, it's impossible to have both > merge- and non-merge commits on the same command-line. T3506: validate '-m 1 -ff' is now accepted for non-merge commits T3502: validate '-m 1' argument is now accepted for non-merge commits T3510: stop using '-m 1' to force failure mid-sequence of cherry-picksĬherry-pick: do not error on non-merge commits when '-m 1' is Inline with the trends to assume first parent to be the mainline in It also opens the way to making '-m 1' the default, that would be This patch series allow '-m 1' for non-merge commits as well as fixes Specifying '-m 1' fails on non-merge commits. '-m 1' results in cherry-pick refusing to handle merge commits, while Merge- and non-merge commits on the same command-line. When cherry-picking multiple commits, it's impossible to have both Subject: Allow 'cherry-pick -m 1' for non-merge commitsĪllow 'cherry-pick -m 1' for non-merge commits Received: from osv by osv with local (Exim 4.84_2) Received-SPF: pass (ip-172-31-2-110: connection is authenticated) Received: from osv (unknown )īy (Postfix) with ESMTPSA id EA9913FBE9 X-Greylist: delayed 575 seconds by postgrey-1.27 at Received: from ( )īy mail.wl. (Postfix) with ESMTP id 030742CE00 X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DATE_IN_PAST_06_12,ĭKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI X-Spam-Checker-Version: SpamAssassin 3.3.1 () on Received: by mail.wl. (Postfix, from userid 486) Received: from mail.wl. (localhost )īy mail.wl. (Postfix) with ESMTP id 616E02CE00 Received: from mail.wl. (īy (Postfix) with ESMTP id 711AB16B1
0 Comments
Leave a Reply. |