backend: Support file deletion in GitHub CreateBranch (#3104)

lyft · Aug 29, 2024 · 9998f12 · 9998f12
1 parent 8c59b7b
commit 9998f12
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/backend/service/github/github.go b/backend/service/github/github.go
@@ -375,15 +375,21 @@ func (s *svc) CreateBranch(ctx context.Context, req *CreateBranchRequest) error
 	}
 
 	for filename, contents := range req.Files {
-		fh, err := wt.Filesystem.Create(filename)
-		if err != nil {
-			return err
-		}
-		if _, err := io.Copy(fh, contents); err != nil {
-			return err
-		}
-		if err := wt.AddWithOptions(&git.AddOptions{Path: filename}); err != nil {
-			return err
+		if contents == nil {
+			if err := wt.Filesystem.Remove(filename); err != nil {
+				return err
+			}
+		} else {
+			fh, err := wt.Filesystem.Create(filename)
+			if err != nil {
+				return err
+			}
+			if _, err := io.Copy(fh, contents); err != nil {
+				return err
+			}
+			if err := wt.AddWithOptions(&git.AddOptions{Path: filename}); err != nil {
+				return err
+			}
 		}
 	}