Merge branch 'main' into dependabot/github_actions/goreleaser/gorelea…

…ser-action-6.0.0
Skyscanner · Aug 5, 2024 · 36fb59e · 36fb59e
2 parents f9f3a48 + 6197cf2
commit 36fb59e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1
+        uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: v1.42.1

diff --git a/cmd/clone/clone.go b/cmd/clone/clone.go
@@ -126,6 +126,7 @@ func run(c *cobra.Command, _ []string) {
 			err = g.Pull(pullFromUpstreamActivity.Writer(), repoDirPath, "upstream", defaultBranch)
 			if err != nil {
 				pullFromUpstreamActivity.EndWithFailure(err)
+				logger.Printf("\nWe weren't able to pull the latest upstream changes into your fork of %s. This is probably because you have a pre-existing fork with commits ahead of upstream. Please change this or delete your fork, and try again.\n", repo.FullRepoName)
 				errorCount++
 				continue
 			}

diff --git a/cmd/clone/clone_test.go b/cmd/clone/clone_test.go
@@ -204,6 +204,8 @@ func TestItLogsPullErrorsButContinuesToTryAll(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Contains(t, out, "Pulling latest changes from org1/repo1")
 	assert.Contains(t, out, "Pulling latest changes from org2/repo2")
+	assert.Contains(t, out, "We weren't able to pull the latest upstream changes into your fork of org1/repo1")
+	assert.Contains(t, out, "We weren't able to pull the latest upstream changes into your fork of org2/repo2")
 	assert.Contains(t, out, "turbolift clone completed with errors")
 	assert.Contains(t, out, "2 repos errored")