From: Elijah Newren <newren@gmail.com>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>
Subject: Re: [PATCH 4/4] rebase: remove a couple of redundant strategy tests
Date: Sat, 1 Apr 2023 12:31:09 -0700 [thread overview]
Message-ID: <CABPp-BGwj-_JRWose89tg2HXQoOoriPqHzW6XC0s5qJDayPTmQ@mail.gmail.com> (raw)
In-Reply-To: <3e02eeff78b23711187de47a1a820f9bde683200.1678893298.git.phillip.wood@dunelm.org.uk>
On Wed, Mar 15, 2023 at 8:38 AM Phillip Wood <phillip.wood123@gmail.com> wrote:
>
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> The test removed in t3402 has been redundant ever since 80ff47957b
> (rebase: remember strategy and strategy options, 2011-02-06) which added
> a new test the first part of which (as noted in the commit message)
> duplicated the existing test. The test removed in t3418 has been
> redundant since the merge backend was removed in 68aa495b59 (rebase:
> implement --merge via the interactive machinery, 2018-12-11) as it now
> tests the same code paths as the preceding test.
I was really confused by this commit message at first. Eventually, I
figured out you were talking about the changes in this commit, just in
past tense. Could we change it to imperative tense? E.g.
Remove a test in t3402 that has been redundant ever since 80ff47957b
(rebase: remember strategy and strategy options, 2011-02-06). That commit added
a new test, the first part of which (as noted in the old commit message)
duplicated an existing test.
Also remove a test t3418 that has been redundant since the merge
backend was removed in 68aa495b59 (rebase: implement --merge
via the interactive machinery, 2018-12-11), since it now tests the
same code paths as the preceding test.
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> ---
> t/t3402-rebase-merge.sh | 21 ---------------------
> t/t3418-rebase-continue.sh | 32 --------------------------------
> 2 files changed, 53 deletions(-)
>
> diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
> index 7e46f4ca85..79b0640c00 100755
> --- a/t/t3402-rebase-merge.sh
> +++ b/t/t3402-rebase-merge.sh
> @@ -131,27 +131,6 @@ test_expect_success 'picking rebase' '
> esac
> '
>
> -test_expect_success 'rebase -s funny -Xopt' '
> - test_when_finished "rm -fr test-bin funny.was.run" &&
> - mkdir test-bin &&
> - cat >test-bin/git-merge-funny <<-EOF &&
> - #!$SHELL_PATH
> - case "\$1" in --opt) ;; *) exit 2 ;; esac
> - shift &&
> - >funny.was.run &&
> - exec git merge-recursive "\$@"
> - EOF
> - chmod +x test-bin/git-merge-funny &&
> - git reset --hard &&
> - git checkout -b test-funny main^ &&
> - test_commit funny &&
> - (
> - PATH=./test-bin:$PATH &&
> - git rebase -s funny -Xopt main
> - ) &&
> - test -f funny.was.run
> -'
> -
> test_expect_success 'rebase --skip works with two conflicts in a row' '
> git checkout second-side &&
> tr "[A-Z]" "[a-z]" <newfile >tmp &&
> diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
> index 42c3954125..2d0789e554 100755
> --- a/t/t3418-rebase-continue.sh
> +++ b/t/t3418-rebase-continue.sh
> @@ -97,38 +97,6 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
> test_cmp expect actual
> '
>
> -test_expect_success 'rebase -i --continue handles merge strategy and options' '
> - rm -fr .git/rebase-* &&
> - git reset --hard commit-new-file-F2-on-topic-branch &&
> - test_commit "commit-new-file-F3-on-topic-branch-for-dash-i" F3 32 &&
> - test_when_finished "rm -fr test-bin funny.was.run funny.args" &&
> - mkdir test-bin &&
> - cat >test-bin/git-merge-funny <<-EOF &&
> - #!$SHELL_PATH
> - echo "\$@" >>funny.args
> - case "\$1" in --opt) ;; *) exit 2 ;; esac
> - case "\$2" in --foo) ;; *) exit 2 ;; esac
> - case "\$4" in --) ;; *) exit 2 ;; esac
> - shift 2 &&
> - >funny.was.run &&
> - exec git merge-recursive "\$@"
> - EOF
> - chmod +x test-bin/git-merge-funny &&
> - (
> - PATH=./test-bin:$PATH &&
> - test_must_fail git rebase -i -s funny -Xopt -Xfoo main topic
> - ) &&
> - test -f funny.was.run &&
> - rm funny.was.run &&
> - echo "Resolved" >F2 &&
> - git add F2 &&
> - (
> - PATH=./test-bin:$PATH &&
> - git rebase --continue
> - ) &&
> - test -f funny.was.run
> -'
> -
> test_expect_success 'rebase -r passes merge strategy options correctly' '
> rm -fr .git/rebase-* &&
> git reset --hard commit-new-file-F3-on-topic-branch &&
> --
> 2.39.2
Looks good otherwise.
next prev parent reply other threads:[~2023-04-01 19:31 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-15 15:14 [PATCH 0/4] rebase: cleanup merge strategy option handling Phillip Wood
2023-03-15 15:14 ` [PATCH 1/4] rebase: stop reading and writing unnecessary strategy state Phillip Wood
2023-03-15 15:14 ` [PATCH 2/4] rebase -m: cleanup --strategy-option handling Phillip Wood
2023-03-15 15:14 ` [PATCH 3/4] rebase -m: fix serialization of strategy options Phillip Wood
2023-04-01 19:27 ` Elijah Newren
2023-04-04 13:02 ` Phillip Wood
2023-03-15 15:14 ` [PATCH 4/4] rebase: remove a couple of redundant strategy tests Phillip Wood
2023-04-01 19:31 ` Elijah Newren [this message]
2023-04-04 13:04 ` Phillip Wood
2023-03-15 16:03 ` [PATCH 0/4] rebase: cleanup merge strategy option handling Junio C Hamano
2023-03-15 16:50 ` Felipe Contreras
2023-04-01 19:32 ` Elijah Newren
2023-04-05 15:21 ` [PATCH v2 0/5] " Phillip Wood
2023-04-05 15:21 ` [PATCH v2 1/5] rebase: stop reading and writing unnecessary strategy state Phillip Wood
2023-04-05 15:21 ` [PATCH v2 2/5] sequencer: use struct strvec to store merge strategy options Phillip Wood
2023-04-07 5:44 ` Elijah Newren
2023-04-05 15:21 ` [PATCH v2 3/5] rebase -m: cleanup --strategy-option handling Phillip Wood
2023-04-05 15:21 ` [PATCH v2 4/5] rebase -m: fix serialization of strategy options Phillip Wood
2023-04-07 5:47 ` Elijah Newren
2023-04-05 15:21 ` [PATCH v2 5/5] rebase: remove a couple of redundant strategy tests Phillip Wood
2023-04-07 5:49 ` [PATCH v2 0/5] rebase: cleanup merge strategy option handling Elijah Newren
2023-04-07 13:57 ` Phillip Wood
2023-04-07 17:53 ` Junio C Hamano
2023-04-07 13:55 ` [PATCH v3 " Phillip Wood
2023-04-07 13:55 ` [PATCH v3 1/5] rebase: stop reading and writing unnecessary strategy state Phillip Wood
2023-04-07 13:55 ` [PATCH v3 2/5] sequencer: use struct strvec to store merge strategy options Phillip Wood
2023-04-07 13:55 ` [PATCH v3 3/5] rebase -m: cleanup --strategy-option handling Phillip Wood
2023-04-07 13:55 ` [PATCH v3 4/5] rebase -m: fix serialization of strategy options Phillip Wood
2023-04-07 13:55 ` [PATCH v3 5/5] rebase: remove a couple of redundant strategy tests Phillip Wood
2023-04-10 9:08 ` [PATCH v4 0/5] rebase: cleanup merge strategy option handling Phillip Wood
2023-04-10 9:08 ` [PATCH v4 1/5] rebase: stop reading and writing unnecessary strategy state Phillip Wood
2023-04-10 9:08 ` [PATCH v4 2/5] sequencer: use struct strvec to store merge strategy options Phillip Wood
2023-04-10 9:08 ` [PATCH v4 3/5] rebase -m: cleanup --strategy-option handling Phillip Wood
2023-04-10 9:08 ` [PATCH v4 4/5] rebase -m: fix serialization of strategy options Phillip Wood
2023-04-10 9:08 ` [PATCH v4 5/5] rebase: remove a couple of redundant strategy tests Phillip Wood
2023-04-10 16:46 ` [PATCH v4 0/5] rebase: cleanup merge strategy option handling 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=CABPp-BGwj-_JRWose89tg2HXQoOoriPqHzW6XC0s5qJDayPTmQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).