From: Colin Stagner <ask+git@howdoi.land>
To: Ian Jackson <ijackson@chiark.greenend.org.uk>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] git-subtree: Bail out if we find output from Rust rewrite (test)
Date: Wed, 8 Jul 2026 20:59:16 -0500 [thread overview]
Message-ID: <9ef8cfcc-ab47-479b-9f23-71ba99e1e56b@howdoi.land> (raw)
In-Reply-To: <20260706115816.20267-3-ijackson@chiark.greenend.org.uk>
On 7/6/26 06:58, Ian Jackson wrote:
> --- a/contrib/subtree/t/t7900-subtree.sh
> +++ b/contrib/subtree/t/t7900-subtree.sh
> @@ -439,6 +439,24 @@ test_expect_success 'split sub dir/ with --rejoin' '
> )
> '
>
> +test_expect_success 'split fail on RIIR git subtree data' '
> + subtree_test_create_repo "$test_count" &&
> + subtree_test_create_repo "$test_count/sub proj" &&
It may be slightly faster to create only one repo and just make orphan
branches, like `test_create_subtree_add()` does.
> + echo "# sabotage" >.git-subtree/config &&
> + git add .git-subtree/config &&
> + git commit -m sabotage &&
`test_commit()` from test-lib-functions.sh may be superior to manually
writing and committing this file.
Colin
next prev parent reply other threads:[~2026-07-09 1:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-06 11:58 [PATCH 0/2] git-subtree: Bail out if we find output from Rust rewrite Ian Jackson
2026-07-06 11:58 ` [PATCH 1/2] " Ian Jackson
2026-07-06 14:44 ` Junio C Hamano
2026-07-06 15:03 ` Ian Jackson
2026-07-06 20:16 ` Junio C Hamano
2026-07-09 1:49 ` Colin Stagner
2026-07-06 11:58 ` [PATCH 2/2] git-subtree: Bail out if we find output from Rust rewrite (test) Ian Jackson
2026-07-09 1:59 ` Colin Stagner [this message]
2026-07-09 9:36 ` [PATCH 1/2] git-subtree: Bail out if we find output from Rust rewrite [and 1 more messages] Ian Jackson
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=9ef8cfcc-ab47-479b-9f23-71ba99e1e56b@howdoi.land \
--to=ask+git@howdoi.land \
--cc=git@vger.kernel.org \
--cc=ijackson@chiark.greenend.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox