Update to 0.40. User-visible changes:

- document our default choice of text editor
- fix got.conf overriding GOT_AUTHOR even if no author is set in got.conf
- fix crash in got_free_gotconfig()
- print newline to clear the bottom line when tog exits

1 files changed, 0 insertions, 20 deletions

diff --git a/devel/got/files/patch-regress_cmdline_common.sh b/devel/got/files/patch-regress_cmdline_common.sh
index 6d5156bca83a..23d0105f1852 100644
--- a/devel/got/files/patch-regress_cmdline_common.sh
+++ b/devel/got/files/patch-regress_cmdline_common.sh
@@ -1,4 +1,3 @@
-XXX remove second hunk after 0.39
 --- regress/cmdline/common.sh.orig	2020-09-13 18:20:00 UTC
 +++ regress/cmdline/common.sh
 @@ -24,6 +24,20 @@ export GOT_LOG_DEFAULT_LIMIT=0
@@ -22,25 +21,6 @@ XXX remove second hunk after 0.39
  git_init()
  {
  	git init -q "$1"
-@@ -96,13 +110,13 @@ git_show_tree()
- 
- trim_obj_id()
- {
--	let trimcount=$1
--	id=$2
-+	local trimcount=$1
-+	local id=$2
- 
--	pat=""
--	while [ trimcount -gt 0 ]; do
-+	local pat=""
-+	while [ "$trimcount" -gt 0 ]; do
- 		pat="[0-9a-f]$pat"
--		let trimcount--
-+		trimcount=$((trimcount - 1))
- 	done
- 
- 	echo ${id%$pat}
 @@ -168,7 +182,7 @@ test_init()
  		echo "No test name provided" >&2
  		return 1