Skip to content

Prevent commit when no changes are staged #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artem-y merged 2 commits into from
Apr 18, 2024
Merged

Prevent commit when no changes are staged #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94ae2cb
Prevent commit when message is empty
artem-y Apr 18, 2024
b0b95a2
Prevent commit when no staged changes
artem-y Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion cmd/commit/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func main() {
// Reads commit message from command line arguments
func getCommitMessage() string {
args := os.Args[1:]
if len(args) < 1 {
if len(args) < 1 || args[0] == "" {
fmt.Fprintln(os.Stderr, helpers.Red("Commit message cannot be empty"))
os.Exit(1)
}
Expand Down Expand Up @@ -115,6 +115,9 @@ func makeCommitOptions(usr user.User) git.CommitOptions {
// Commits changes with provided message
func commitChanges(repo *git.Repository, commitMessage string) {
worktree := openWorktree(repo)

checkStagedChanges(worktree)

usr := user.GetUser(*repo)
commitOptions := makeCommitOptions(usr)

Expand All @@ -124,3 +127,21 @@ func commitChanges(repo *git.Repository, commitMessage string) {
os.Exit(1)
}
}

// Checks if there are any staged changes to commit
func checkStagedChanges(worktree *git.Worktree) {
fileStatuses, err := worktree.Status()
if err != nil {
fmt.Fprintf(os.Stderr, helpers.Red("Failed to read the status of the worktree: %v\n"), err)
os.Exit(1)
}

for _, status := range fileStatuses {
if status.Staging != git.Unmodified {
return
}
}

fmt.Fprintln(os.Stderr, helpers.Red("No staged changes to commit"))
os.Exit(1)
}