|
@@ -84,9 +84,8 @@ func clone(repo string, clonePath string, auth *gitssh.PublicKeys) (*gogit.Repos
|
84
|
84
|
|
85
|
85
|
|
86
|
86
|
|
87
|
|
-
|
88
|
|
-
|
89
|
|
-
|
|
87
|
+
|
|
88
|
+
|
90
|
89
|
func pull(clonePath string, auth *gitssh.PublicKeys) (*gogit.Repository, error) {
|
91
|
90
|
|
92
|
91
|
r, err := gogit.PlainOpen(clonePath)
|
|
@@ -134,8 +133,7 @@ func dirExists(path string) (bool, error) {
|
134
|
133
|
|
135
|
134
|
|
136
|
135
|
|
137
|
|
-
|
138
|
|
-
|
|
136
|
+
|
139
|
137
|
func Push(r *gogit.Repository, cfg config.GitSettings) error {
|
140
|
138
|
|
141
|
139
|
auth, err := getAuth(cfg.User, cfg.PrivateKeyPath)
|
|
@@ -166,6 +164,8 @@ func Push(r *gogit.Repository, cfg config.GitSettings) error {
|
166
|
164
|
|
167
|
165
|
|
168
|
166
|
|
|
167
|
+
|
|
168
|
+
|
169
|
169
|
func checkRemoteErrors(err error, logFields logrus.Fields) error {
|
170
|
170
|
var nonError bool
|
171
|
171
|
|
|
@@ -182,12 +182,6 @@ func checkRemoteErrors(err error, logFields logrus.Fields) error {
|
182
|
182
|
break
|
183
|
183
|
}
|
184
|
184
|
|
185
|
|
-
|
186
|
|
-
|
187
|
|
- if strings.HasPrefix(err.Error(), "non-fast-forward update") {
|
188
|
|
- nonError = true
|
189
|
|
- }
|
190
|
|
-
|
191
|
185
|
|
192
|
186
|
if nonError {
|
193
|
187
|
logrus.WithFields(logFields).Warn("Caught specific non-error")
|