Fixed logic

integrations · Oct 15, 2024 · 354adbb · 354adbb
1 parent c3c2480
commit 354adbb
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/github/resource_github_branch_default.go b/github/resource_github_branch_default.go
@@ -148,13 +148,10 @@ func resourceGithubBranchDefaultUpdate(d *schema.ResourceData, meta interface{})
 			return err
 		}
 
-		// We don't want to rename branch if its already the default branch
-		if defaultBranch == *repository.DefaultBranch {
-			return nil
-		}
-
-		if _, _, err := client.Repositories.RenameBranch(ctx, owner, repoName, *repository.DefaultBranch, defaultBranch); err != nil {
-			return err
+		if defaultBranch != *repository.DefaultBranch {
+			if _, _, err := client.Repositories.RenameBranch(ctx, owner, repoName, *repository.DefaultBranch, defaultBranch); err != nil {
+				return err
+			}
 		}
 	} else {
 		repository := &github.Repository{