Subject: Re: [PATCH] Revert "contrib: subtree: adjust test to change in fmt-merge-msg"

From: Junio C Hamano <[email-masked]>
Date: Mon, 03 Aug 2020 12:43:25 -0700

Emily Shaffer <[email-masked]> writes:

> This reverts commit 508fd8e8baf3e18ee40b2cf0b8899188a8506d07.
>
> In 6e6029a8 (fmt-merge-msg: allow merge destination to be omitted again)
> we get back the behavior where merges against 'master', by default, do
> not include "into 'master'" at the end of the merge message. This test
> fix is no longer needed.
>
> Signed-off-by: Emily Shaffer <[email-masked]>
> ---
>
> I don't think anybody else sent this yet. Because the default value of
> merge.suppressDest suppresses 'master', the commit messages are wrong
> again for these tests. Noticed during a release for $DAYJOB. Thanks -
> looks like Linus was right that we get to remove lots more instances of
> 'master' from codebase with that config patch.

I as many others personally do not care about subtree and normally
do not run its tests, so it is understandable that this was missed.
Thanks for catching.

I wonder if it makes more sense to move this (or other tests in
contrib/ if any) in the normal test suite so that we'd notice its
breakage, though.

>  contrib/subtree/t/t7900-subtree.sh | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
> index 53d7accf94..57ff4b25c1 100755
> --- a/contrib/subtree/t/t7900-subtree.sh
> +++ b/contrib/subtree/t/t7900-subtree.sh
> @@ -196,8 +196,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
>  		cd "$subtree_test_count" &&
>  		git fetch ./"sub proj" master &&
>  		git subtree merge --prefix="sub dir" FETCH_HEAD &&
> -		check_equal "$(last_commit_message)" \
> -			"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
> +		check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
>  	)
>  '
>  
> @@ -274,8 +273,7 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
>  		cd "$test_count" &&
>  		git fetch ./subproj master &&
>  		git subtree merge --prefix=subdir/ FETCH_HEAD &&
> -		check_equal "$(last_commit_message)" \
> -			"Merge commit '\''$(git rev-parse FETCH_HEAD)'\'' into master"
> +		check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
>  	)
>  '