Ensure we only set branch on import if it's not the default branch

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/resource_github_repository_file.go

@@ -436,10 +436,20 @@ func resourceGithubRepositoryFileImport(ctx context.Context, d *schema.ResourceD
 	owner := meta.(*Owner).name
 	repo, file := splitRepoFilePath(repoFilePath)
 
-	opts := &github.RepositoryContentGetOptions{Ref: branch}
-	if err := d.Set("branch", branch); err != nil {
+	repoInfo, _, err := client.Repositories.Get(ctx, owner, repo)
+	if err != nil {
 		return nil, err
 	}
+	defaultBranch := repoInfo.GetDefaultBranch()
+	opts := &github.RepositoryContentGetOptions{}
+
+	if branch != defaultBranch {
+		opts.Ref = branch
+		if err := d.Set("branch", branch); err != nil {
+			return nil, err
+		}
+	}
+
 	fc, _, _, err := client.Repositories.GetContents(ctx, owner, repo, file, opts)
 	if err != nil {
 		return nil, err

github/resource_github_repository_file_test.go

@@ -457,10 +457,11 @@ func TestAccGithubRepositoryFile(t *testing.T) {
 					),
 				},
 				{
-					ResourceName:      "github_repository_file.test",
-					ImportState:       true,
-					ImportStateVerify: true,
-					ImportStateId:     fmt.Sprintf("%s/%s:main", repoName, "test"),
+					ResourceName:            "github_repository_file.test",
+					ImportState:             true,
+					ImportStateVerify:       true,
+					ImportStateId:           fmt.Sprintf("%s/%s:main", repoName, "test"),
+					ImportStateVerifyIgnore: []string{"commit_author", "commit_email"}, // For some reason `d` doesn't contain the commit author and email when importing.
 				},
 			},
 		})