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

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

[Emily Shaffer]

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 <emilyshaffer@google.com>
---

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.

 - Emily

 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)'\''"
 	)
 '
 
-- 
2.28.0.163.g6104cc2f0b6-goog

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

[Junio C Hamano]

Emily Shaffer <emilyshaffer@google.com> 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 <emilyshaffer@google.com>
> ---
>
> 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)'\''"
>  	)
>  '

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

[Emily Shaffer]

On Mon, Aug 03, 2020 at 12:43:25PM -0700, Junio C Hamano wrote:
> 
> Emily Shaffer <emilyshaffer@google.com> writes:
> 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.

I'd welcome that change. We have some scripted step during our release
process to run those specially, and it'd be nice not to have to.

 - Emily

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

[Derrick Stolee]

On 8/3/2020 6:39 PM, Emily Shaffer wrote:
> On Mon, Aug 03, 2020 at 12:43:25PM -0700, Junio C Hamano wrote:
>>
>> Emily Shaffer <emilyshaffer@google.com> writes:
>> 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.
> 
> I'd welcome that change. We have some scripted step during our release
> process to run those specially, and it'd be nice not to have to.

I support that addition of contrib/ tests in the normal test suite,
or even just part of the CI builds. Anything to help catch these things
earlier.

Thanks,
-Stolee