Re: [PATCH 2/2] git-subtree: Bail out if we find output from Rust rewrite (test)

From: Colin Stagner <ask+git@howdoi.land>
Date: Jul 9, 2026, 01:59 UTC
Message-ID: <9ef8cfcc-ab47-479b-9f23-71ba99e1e56b@howdoi.land>
In-Reply-To: <20260706115816.20267-3-ijackson@chiark.greenend.org.uk>

On 7/6/26 06:58, Ian Jackson wrote:

Show 9 quoted lines

> --- 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