git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
@ 2020-08-03 18:57 Emily Shaffer
  2020-08-03 19:43 ` Junio C Hamano
  0 siblings, 1 reply; 4+ messages in thread
From: Emily Shaffer @ 2020-08-03 18:57 UTC (permalink / raw)
  To: git; +Cc: Emily Shaffer, Đoàn Trần Công Danh

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
  2020-08-03 18:57 [PATCH] Revert "contrib: subtree: adjust test to change in fmt-merge-msg" Emily Shaffer
@ 2020-08-03 19:43 ` Junio C Hamano
  2020-08-03 22:39   ` Emily Shaffer
  0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2020-08-03 19:43 UTC (permalink / raw)
  To: Emily Shaffer; +Cc: git, Đoàn Trần Công Danh

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)'\''"
>  	)
>  '

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
  2020-08-03 19:43 ` Junio C Hamano
@ 2020-08-03 22:39   ` Emily Shaffer
  2020-08-04 13:12     ` Derrick Stolee
  0 siblings, 1 reply; 4+ messages in thread
From: Emily Shaffer @ 2020-08-03 22:39 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Đoàn Trần Công Danh

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] Revert "contrib: subtree: adjust test to change in fmt-merge-msg"
  2020-08-03 22:39   ` Emily Shaffer
@ 2020-08-04 13:12     ` Derrick Stolee
  0 siblings, 0 replies; 4+ messages in thread
From: Derrick Stolee @ 2020-08-04 13:12 UTC (permalink / raw)
  To: Emily Shaffer, Junio C Hamano
  Cc: git, Đoàn Trần Công Danh

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-08-04 13:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-03 18:57 [PATCH] Revert "contrib: subtree: adjust test to change in fmt-merge-msg" Emily Shaffer
2020-08-03 19:43 ` Junio C Hamano
2020-08-03 22:39   ` Emily Shaffer
2020-08-04 13:12     ` Derrick Stolee

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/inbox.comp.version-control.git
	nntp://ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd.onion/inbox.comp.version-control.git
	nntp://4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git