Merge pull request #4 from prefapp/feat/allow-empty-commits

feat: Allow empty commits

Author: juanjosevazquezgil

git/git.go

@@ -2,6 +2,7 @@ package git
 
 import (
 	"context"
+	"crypto/sha256"
 	"errors"
 	"fmt"
 	"os"
@@ -159,20 +160,29 @@ func getGroupedFiles(fileStatuses git.Status) ([]string, []string, []string, err
 		case "?", "A":
 			addedFiles = append(addedFiles, file)
 		default:
-			return nil, nil, nil, errors.New(
-				fmt.Sprintf(
-					"Unsupported status code %c for file %s",
-					status.Worktree,
-					file,
-				),
+			return nil, nil, nil, fmt.Errorf(
+				"Unsupported status code %c for file %s",
+				status.Worktree,
+				file,
 			)
 		}
 	}
 
 	return addedFiles, updatedFiles, deletedFiles, nil
 }
 
-func UploadToRepo(ctx context.Context, client *github.Client, repo repository.Repository, path string, deletePath string, branch string, headBranch string, message string) (*github.Reference, *github.Response, error) {
+func UploadToRepo(
+	ctx context.Context,
+	client *github.Client,
+	repo repository.Repository,
+	path string,
+	deletePath string,
+	branch string,
+	headBranch string,
+	message string,
+	createEmpty *bool,
+	allowEmpty *bool,
+) (*github.Reference, *github.Response, error) {
 
 	// Get the current currentCommit
 	currentCommit, err := getCurrentCommit(ctx, client, repo, headBranch)
@@ -186,52 +196,125 @@ func UploadToRepo(ctx context.Context, client *github.Client, repo repository.Re
 	if err != nil {
 		return nil, nil, err
 	}
+	addedAndUpdatedFiles := append(updatedFiles, addedFiles...)
 
-	// Create a blob for each file
-	blobs := []*github.Blob{}
-	filePaths := []string{}
-
-	// Delete the files
-	// Get the files that are deleted
-	fmt.Println("--- Deleted files--")
-	fmt.Println(deletedFiles)
-
-	for _, file := range deletedFiles {
-		if strings.HasPrefix(file, deletePath) {
-			blobs = append(blobs, &github.Blob{
-				SHA: nil,
-			})
-
-			filePaths = append(filePaths, file)
+	if (len(addedAndUpdatedFiles) == 0 && len(deletedFiles) == 0 && *allowEmpty) || *createEmpty {
+		// In order to push an empty commit, we first need to create a
+		// dummy file and commit it to the branch
+		fileName := fmt.Sprintf("%x", sha256.Sum256(
+			[]byte("firestartr-empty-commit-dummy.txt"),
+		))
+		dummy, err := os.Create(fileName)
+		if err != nil {
+			return nil, nil, err
 		}
-	}
+		defer dummy.Close()
 
-	addedAndUpdatedFiles := append(updatedFiles, addedFiles...)
-	// Get the updated files
-	fmt.Println("--- Updated files--")
-	fmt.Println(addedAndUpdatedFiles)
+		blob, _, err := createBlobForFile(ctx, client, repo, fileName)
+		if err != nil {
+			return nil, nil, err
+		}
+		tree, _, err := createNewTree(
+			ctx,
+			client,
+			repo,
+			[]*github.Blob{blob},
+			[]string{fileName},
+			currentCommit.GetSHA(),
+		)
+		if err != nil {
+			return nil, nil, err
+		}
 
-	for _, file := range addedAndUpdatedFiles {
-		blob, _, err := createBlobForFile(ctx, client, repo, file)
+		commit, _, err := createNewCommit(
+			ctx, client, repo, tree,
+			currentCommit, message,
+		)
+		if err != nil {
+			return nil, nil, err
+		}
 
-		blobs = append(blobs, blob)
+		// Then we delete it and set that commit as the new head commit
+		// of the branch. This results in a commit that has no changes
+		// with the main branch, but a different hash
+		emptyTree, _, err := createNewTree(
+			ctx,
+			client,
+			repo,
+			[]*github.Blob{{SHA: nil}},
+			[]string{fileName},
+			commit.GetSHA(),
+		)
+		if err != nil {
+			return nil, nil, err
+		}
 
+		emptyCommit, _, err := createNewCommit(
+			ctx, client, repo, emptyTree,
+			currentCommit, message,
+		)
 		if err != nil {
 			return nil, nil, err
 		}
 
-		filePaths = append(filePaths, file)
-	}
+		ref, resp, respErr := setBranchToCommit(ctx, client, repo, branch, emptyCommit)
 
-	tree, _, err := createNewTree(ctx, client, repo, blobs, filePaths, currentCommit.GetSHA())
-	if err != nil {
-		return nil, nil, err
-	}
+		err = os.Remove(fileName)
+		if err != nil {
+			return nil, nil, err
+		}
 
-	commit, _, err := createNewCommit(ctx, client, repo, tree, currentCommit, message)
-	if err != nil {
-		return nil, nil, err
+		return ref, resp, respErr
+	} else {
+		if len(addedAndUpdatedFiles) > 0 || len(deletedFiles) > 0 {
+			// Create a blob for each file
+			blobs := []*github.Blob{}
+			filePaths := []string{}
+
+			// Delete the files
+			// Get the files that are deleted
+			fmt.Println("--- Deleted files--")
+			fmt.Println(deletedFiles)
+
+			for _, file := range deletedFiles {
+				if strings.HasPrefix(file, deletePath) {
+					blobs = append(blobs, &github.Blob{
+						SHA: nil,
+					})
+
+					filePaths = append(filePaths, file)
+				}
+			}
+
+			// Get the updated files
+			fmt.Println("--- Updated files--")
+			fmt.Println(addedAndUpdatedFiles)
+
+			for _, file := range addedAndUpdatedFiles {
+				blob, _, err := createBlobForFile(ctx, client, repo, file)
+
+				blobs = append(blobs, blob)
+
+				if err != nil {
+					return nil, nil, err
+				}
+
+				filePaths = append(filePaths, file)
+			}
+
+			tree, _, err := createNewTree(ctx, client, repo, blobs, filePaths, currentCommit.GetSHA())
+			if err != nil {
+				return nil, nil, err
+			}
+
+			commit, _, err := createNewCommit(ctx, client, repo, tree, currentCommit, message)
+			if err != nil {
+				return nil, nil, err
+			}
+
+			return setBranchToCommit(ctx, client, repo, branch, commit)
+		} else {
+			return nil, nil, errors.New("no new files to commit")
+		}
 	}
-
-	return setBranchToCommit(ctx, client, repo, branch, commit)
 }

main.go

@@ -24,6 +24,8 @@ func main() {
 	message := flag.String("m", "Commit message", "Commit message")
 	deletePath := flag.String("delete-path", "", "Path in the origin repository to delete files from before adding new ones")
 	headBranch := flag.String("h", "", "Head branch name")
+	createEmpty := flag.Bool("e", false, "Create an empty commit")
+	allowEmpty := flag.Bool("a", false, "Allow empty commits")
 	flag.Parse()
 
 	if *headBranch == "" {
@@ -56,7 +58,11 @@ func main() {
 	}
 
 	// upload files
-	ref, _, err := git.UploadToRepo(context.Background(), client, parsedRepo, *dir, *deletePath, *branch, *headBranch, *message)
+	ref, _, err := git.UploadToRepo(
+		context.Background(), client, parsedRepo,
+		*dir, *deletePath, *branch, *headBranch,
+		*message, createEmpty, allowEmpty,
+	)
 
 	if err != nil {
 		fmt.Println("Error uploading files:", err)