From: Junio C Hamano <gitster@pobox.com> To: Sergey Organov <sorganov@gmail.com> Cc: git@vger.kernel.org Subject: Re: [PATCH v2 0/4] Allow 'cherry-pick -m 1' for non-merge commits Date: Wed, 26 Dec 2018 14:52:07 -0800 [thread overview] Message-ID: <xmqqr2e1mmuu.fsf@gitster-ct.c.googlers.com> (raw) In-Reply-To: <87tvj1ok4k.fsf@javad.com> Sergey Organov <sorganov@gmail.com>, Sergey Organov <sorganov@gmail.com> writes: > Hi Junio, > > What's the status of these patches? The status of these patches is "Just updated on the list", as far as I am concerned, and its cover letter would have described what's improved relative to the previous round better than whatever answer I could give here ;-) I checked the overall diff between the previous round and the result of applying all four patches to find out that the updates are only to the tests. The changes in the code (still) looked correct. diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh index b1602718f8..3259bd59eb 100755 --- a/t/t3502-cherry-pick-merge.sh +++ b/t/t3502-cherry-pick-merge.sh @@ -40,12 +40,12 @@ test_expect_success 'cherry-pick -m complains of bogus numbers' ' test_expect_code 129 git cherry-pick -m 0 b ' -test_expect_success 'cherry-pick a non-merge with -m should fail' ' +test_expect_success 'cherry-pick explicit first parent of a non-merge' ' git reset --hard && git checkout a^0 && - test_expect_code 128 git cherry-pick -m 1 b && - git diff --exit-code a -- + git cherry-pick -m 1 b && + git diff --exit-code c -- ' @@ -84,12 +84,12 @@ test_expect_success 'cherry pick a merge relative to nonexistent parent should f ' -test_expect_success 'revert a non-merge with -m should fail' ' +test_expect_success 'revert explicit first parent of a non-merge' ' git reset --hard && git checkout c^0 && - test_must_fail git revert -m 1 b && - git diff --exit-code c + git revert -m 1 b && + git diff --exit-code a ' diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh index fb889ac6f0..127dd0082f 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' ' diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index c84eeefdc9..941d5026da 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -61,7 +61,11 @@ test_expect_success 'cherry-pick mid-cherry-pick-sequence' ' test_expect_success 'cherry-pick persists opts correctly' ' pristine_detach initial && - test_expect_code 128 git cherry-pick -s -m 1 --strategy=recursive -X patience -X ours initial..anotherpick && + # to make sure that the session to cherry-pick a sequence + # gets interrupted, use a high-enough number that is larger + # than the number of parents of any commit we have created + mainline=4 && + test_expect_code 128 git cherry-pick -s -m $mainline --strategy=recursive -X patience -X ours initial..anotherpick && test_path_is_dir .git/sequencer && test_path_is_file .git/sequencer/head && test_path_is_file .git/sequencer/todo && @@ -69,7 +73,7 @@ test_expect_success 'cherry-pick persists opts correctly' ' echo "true" >expect && git config --file=.git/sequencer/opts --get-all options.signoff >actual && test_cmp expect actual && - echo "1" >expect && + echo "$mainline" >expect && git config --file=.git/sequencer/opts --get-all options.mainline >actual && test_cmp expect actual && echo "recursive" >expect &&
next prev parent reply other threads:[~2018-12-28 20:13 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 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 ` [PATCH v3 4/4] t3506: validate '-m 1 -ff' " 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 3/4] t3502: validate '-m 1' argument is now accepted " 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-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-25 12:39 ` [PATCH v2 0/4] Allow 'cherry-pick -m 1' for non-merge commits Sergey Organov, Sergey Organov 2018-12-26 22:52 ` Junio C Hamano [this message] 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=xmqqr2e1mmuu.fsf@gitster-ct.c.googlers.com \ --to=gitster@pobox.com \ --cc=git@vger.kernel.org \ --cc=sorganov@gmail.com \ --subject='Re: [PATCH v2 0/4] Allow '\''cherry-pick -m 1'\'' 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).