@@ -37,6 +37,7 @@ import (
37
37
)
38
38
39
39
var w * git.Worktree
40
+ var hasStagingFiles bool
40
41
41
42
func checkErr (err error ) {
42
43
if err != nil {
@@ -108,35 +109,21 @@ func promptList() {
108
109
}
109
110
110
111
func commit (message string ) (err error ) {
111
- s , err := w .Status ()
112
+ username , err := gitconfig .Username ()
113
+ email , err := gitconfig .Email ()
114
+ fmt .Println (Gray ("Changes added, Preparing commit..." ))
115
+
116
+ _ , err = w .Commit (message , & git.CommitOptions {
117
+ Author : & object.Signature {
118
+ Name : username ,
119
+ Email : email ,
120
+ When : time .Now (),
121
+ },
122
+ })
112
123
checkErr (err )
113
-
114
- hasStagingFiles := false
115
- for _ , status := range s {
116
- if status .Staging != 32 && status .Staging != 63 {
117
- hasStagingFiles = true
118
- }
119
- }
120
-
121
- if hasStagingFiles {
122
- username , err := gitconfig .Username ()
123
- email , err := gitconfig .Email ()
124
- fmt .Println (Gray ("Changes added, Preparing commit..." ))
125
-
126
- _ , err = w .Commit (message , & git.CommitOptions {
127
- Author : & object.Signature {
128
- Name : username ,
129
- Email : email ,
130
- When : time .Now (),
131
- },
132
- })
133
- checkErr (err )
134
- lastCommit := "Last commit: " + message
135
- fmt .Println (Gray (lastCommit ))
136
- fmt .Println (Green ("Done" ))
137
- } else {
138
- checkErr (errors .New ("No changes added to commit" ))
139
- }
124
+ lastCommit := "Last commit: " + message
125
+ fmt .Println (Gray (lastCommit ))
126
+ fmt .Println (Green ("Done" ))
140
127
141
128
return
142
129
}
@@ -152,6 +139,19 @@ func init() {
152
139
go (func () {
153
140
w , err = r .Worktree ()
154
141
checkErr (err )
155
- _ = w
142
+
143
+ s , err := w .Status ()
144
+ checkErr (err )
145
+
146
+ hasStagingFiles = false
147
+ for _ , status := range s {
148
+ if status .Staging != 32 && status .Staging != 63 {
149
+ hasStagingFiles = true
150
+ }
151
+ }
152
+
153
+ if ! hasStagingFiles {
154
+ checkErr (errors .New ("No changes added to commit" ))
155
+ }
156
156
})()
157
157
}
0 commit comments