From: Phillip Wood <phillip.wood123@gmail•com>
To: kristofferhaugsbakk@fastmail•com, git@vger•kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk•name>,
christian.couder@gmail•com, newren@gmail•com,
Siddharth Asthana <siddharthasthana31@gmail•com>
Subject: Re: [PATCH 2/2] t3650: add more regression tests for failure conditions
Date: Tue, 23 Dec 2025 10:58:33 +0000 [thread overview]
Message-ID: <65d19cff-33cd-4209-af3d-6a518254019a@gmail.com> (raw)
In-Reply-To: <replay_regression_tests.141@msgid.xyz>
On 22/12/2025 22:04, kristofferhaugsbakk@fastmail•com wrote:
> From: Kristoffer Haugsbakk <code@khaugsbakk•name>
>
> There isn’t much test coverage for basic failure conditions. Let’s add
> a few more since these are simple to write and remove if they become
> obsolete.
Sounds like a good idea
>
> +test_expect_success 'option --onto or --advance is mandatory' '
> + cat >expect <<-\EOF &&
> + error: option --onto or --advance is mandatory
> + EOF
> + # First line is the error; rest is Usage
> + test_must_fail git replay topic1..topic2 >&1 2>&1 |
> + head -1 >actual &&
Using a pipe means we lose the return value of test_must_fail here so
the test wont fail if the command succeeds. Everything else looks good
Thanks
Phillip
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'no base or negative ref gives no-replaying down to root error' '
> + cat >expect <<-\EOF &&
> + fatal: replaying down to root commit is not supported yet!
> + EOF
> + test_must_fail git replay --onto=topic1 topic2 2>actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'options --advance and --contained cannot be used together' '
> + cat >expect <<-EOF &&
> + fatal: options ${SQ}--advance${SQ} and ${SQ}--contained${SQ} cannot be used together
> + EOF
> + test_must_fail git replay --advance=main --contained \
> + topic1..topic2 2>actual &&
> + test_cmp expect actual
> +'
> +
> test_expect_success 'using replay to rebase two branches, one on top of other' '
> git replay --onto main topic1..topic2 >result &&
>
next prev parent reply other threads:[~2025-12-23 10:58 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-22 22:04 [PATCH 0/2] replay: die descriptively when invalid commit-ish kristofferhaugsbakk
2025-12-22 22:04 ` [PATCH 1/2] " kristofferhaugsbakk
2025-12-23 3:12 ` Junio C Hamano
2025-12-23 10:52 ` Phillip Wood
2025-12-23 13:41 ` Junio C Hamano
2025-12-30 14:30 ` Kristoffer Haugsbakk
2025-12-22 22:04 ` [PATCH 2/2] t3650: add more regression tests for failure conditions kristofferhaugsbakk
2025-12-23 10:58 ` Phillip Wood [this message]
2025-12-30 14:33 ` Kristoffer Haugsbakk
2025-12-23 3:16 ` [PATCH 0/2] replay: die descriptively when invalid commit-ish Junio C Hamano
2025-12-30 14:33 ` Kristoffer Haugsbakk
2025-12-24 3:03 ` Elijah Newren
2025-12-30 14:31 ` Kristoffer Haugsbakk
2025-12-30 15:01 ` [PATCH v2 0/5] " kristofferhaugsbakk
2025-12-30 15:01 ` [PATCH v2 1/5] replay: remove dead code and rearrange kristofferhaugsbakk
2025-12-30 22:50 ` Elijah Newren
2025-12-30 23:37 ` Junio C Hamano
2026-01-02 9:51 ` Kristoffer Haugsbakk
2025-12-30 15:01 ` [PATCH v2 2/5] replay: find *onto only after testing for ref name kristofferhaugsbakk
2025-12-30 22:51 ` Elijah Newren
2025-12-30 15:01 ` [PATCH v2 3/5] replay: die descriptively when invalid commit-ish is given kristofferhaugsbakk
2025-12-30 22:52 ` Elijah Newren
2026-01-02 11:11 ` Kristoffer Haugsbakk
2025-12-30 15:01 ` [PATCH v2 4/5] replay: die if we cannot parse object kristofferhaugsbakk
2025-12-30 15:01 ` [PATCH v2 5/5] t3650: add more regression tests for failure conditions kristofferhaugsbakk
2025-12-30 22:53 ` [PATCH v2 0/5] replay: die descriptively when invalid commit-ish Elijah Newren
2026-01-05 19:53 ` [PATCH v3 0/6] " kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 1/6] replay: remove dead code and rearrange kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 2/6] replay: find *onto only after testing for ref name kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 3/6] replay: die descriptively when invalid commit-ish is given kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 4/6] replay: improve code comment and die message kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 5/6] replay: die if we cannot parse object kristofferhaugsbakk
2026-01-05 19:53 ` [PATCH v3 6/6] t3650: add more regression tests for failure conditions kristofferhaugsbakk
2026-01-06 23:12 ` [PATCH v3 0/6] replay: die descriptively when invalid commit-ish Elijah Newren
2026-01-07 3:56 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65d19cff-33cd-4209-af3d-6a518254019a@gmail.com \
--to=phillip.wood123@gmail$(echo .)com \
--cc=christian.couder@gmail$(echo .)com \
--cc=code@khaugsbakk$(echo .)name \
--cc=git@vger$(echo .)kernel.org \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=newren@gmail$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
--cc=siddharthasthana31@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox