new url clone method

Author: firu11

pkg/core/utils.go

@@ -20,18 +20,18 @@ func prepareRepoURL(repoURL *url.URL, proxyURL *url.URL) (*url.URL, *http.BasicA
 	if repoURL == nil {
 		return nil, nil
 	}
-	repo := *repoURL // copy
+	repo := repoURL.Clone()
 
 	// parse auth from url and delete the credentials
-	auth := authFromURL(&repo)
+	auth := authFromURL(repo)
 	repo.User = nil
 
 	// add proxy if specified
 	if proxyURL != nil {
-		return useCorsProxy(&repo, proxyURL), auth
+		return useCorsProxy(repo, proxyURL), auth
 	}
 
-	return &repo, auth
+	return repo, auth
 }
 
 func repoURLFromCalendar(cal *Calendar) (*url.URL, error) {
@@ -65,8 +65,7 @@ func useCorsProxy(original, proxy *url.URL) *url.URL {
 		return original
 	}
 	if original == nil {
-		u := *proxy
-		return &u
+		return proxy.Clone()
 	}
 
 	p := *proxy // copy

pkg/core/utils_test.go

@@ -69,6 +69,11 @@ func TestUseCorsProxy(t *testing.T) {
 		proxy    *url.URL
 		want     *url.URL
 	}{
+		{
+			name:  "no original",
+			proxy: mustParseURL("http://cors-proxy.abc"),
+			want:  mustParseURL("http://cors-proxy.abc"),
+		},
 		{
 			name:     "basic proxy",
 			original: mustParseURL("https://github.com/joe/my-calendar.git"),

pkg/gitmerge/merge_test.go

@@ -3,7 +3,6 @@ package gitmerge
 import (
 	"encoding/json/v2"
 	"errors"
-	"io"
 	"testing"
 	"time"
 
@@ -341,14 +340,9 @@ func assertHeadEvent(t *testing.T, repo *gogit.Repository, want *time.Time) {
 	}
 	defer r.Close()
 
-	data, err := io.ReadAll(r)
-	if err != nil {
-		t.Fatalf("read event blob: %v", err)
-	}
-
 	var got testEvent
-	if err := json.Unmarshal(data, &got); err != nil {
-		t.Fatalf("unmarshal event: %v", err)
+	if err := json.UnmarshalRead(r, &got); err != nil {
+		t.Fatalf("read event blob: %v", err)
 	}
 
 	if !got.UpdatedAt.Equal(*want) {