Update changelog, fix tests

CHANGELOG.md

@@ -10,11 +10,18 @@ internal API changes are not present.
 Main (unreleased)
 -----------------
 
+### Breaking changes
+
+- `import.git`: The default value for `revision` has changed from `HEAD` to `main`. (@ptodev)
+  It is no longer allowed to set `revision` to `"HEAD"`, `"FETCH_HEAD"`, `"ORIG_HEAD"`, `"MERGE_HEAD"`, or `"CHERRY_PICK_HEAD"`.
+
 ### Bugfixes
 
 - Update yet-another-cloudwatch-exporter from v0.60.0 vo v0.61.0: (@morremeyer)
   - Fixes a bug where cloudwatch S3 metrics are reported as `0`
 
+- Fixed a bug in `import.git` which caused a `"non-fast-forward update"` error message. (@ptodev)
+
 
 ### Other changes
 
@@ -108,8 +115,6 @@ v1.4.0-rc.2
   configuration could result in incorrect URLs. The `path` and `key` arguments have been separated to allow for clear and accurate
   specification of Vault secrets. (@PatMis16)
 
-- Fixed a bug in `import.git` which caused a `"non-fast-forward update"` error message. (@ptodev)
-
 ### Other
 
 - Renamed standard library functions. Old names are still valid but are marked deprecated. (@wildum)

internal/runtime/import_git_test.go

@@ -43,6 +43,7 @@ testImport.add "cc" {
 `
 	// Create our git repository.
 	runGit(t, testRepo, "init", testRepo)
+	runGit(t, testRepo, "checkout", "-b", "main")
 
 	// Add the file we want.
 	math := filepath.Join(testRepo, "math.alloy")
@@ -108,6 +109,7 @@ testImport.add "cc" {
 }
 `
 	runGit(t, testRepo, "init", testRepo)
+	runGit(t, testRepo, "checkout", "-b", "main")
 
 	runGit(t, testRepo, "checkout", "-b", "testor")
 
@@ -161,6 +163,8 @@ func TestPullUpdatingFromHash(t *testing.T) {
 	testRepo := t.TempDir()
 
 	runGit(t, testRepo, "init", testRepo)
+	runGit(t, testRepo, "checkout", "-b", "main")
+
 	math := filepath.Join(testRepo, "math.alloy")
 	err := os.WriteFile(math, []byte(contents), 0666)
 	require.NoError(t, err)
@@ -229,6 +233,7 @@ func TestPullUpdatingFromTag(t *testing.T) {
 	testRepo := t.TempDir()
 
 	runGit(t, testRepo, "init", testRepo)
+	runGit(t, testRepo, "checkout", "-b", "main")
 
 	math := filepath.Join(testRepo, "math.alloy")
 	err := os.WriteFile(math, []byte(contents), 0666)
@@ -336,6 +341,7 @@ testImport.add "cc" {
 }
 `
 	runGit(t, testRepo, "init", testRepo)
+	runGit(t, testRepo, "checkout", "-b", "main")
 
 	runGit(t, testRepo, "checkout", "-b", "testor")