|
|
|
|
75
|
|
75
|
|
76
|
// go-git doesn't have an error variable for "non-fast-forward update", so
|
76
|
// go-git doesn't have an error variable for "non-fast-forward update", so
|
77
|
// this is the only way to detect it
|
77
|
// this is the only way to detect it
|
78
|
- if strings.HasPrefix("non-fast-forward update", err.Error()) {
|
|
|
|
|
78
|
+ if strings.HasPrefix(err.Error(), "non-fast-forward update") {
|
79
|
return r, nil
|
79
|
return r, nil
|
80
|
}
|
80
|
}
|
81
|
|
81
|
|
|
|
|
|
108
|
|
108
|
|
109
|
// go-git doesn't have an error variable for "non-fast-forward update", so
|
109
|
// go-git doesn't have an error variable for "non-fast-forward update", so
|
110
|
// this is the only way to detect it
|
110
|
// this is the only way to detect it
|
111
|
- if strings.HasPrefix("non-fast-forward update", err.Error()) {
|
|
|
|
|
111
|
+ if strings.HasPrefix(err.Error(), "non-fast-forward update") {
|
112
|
return nil
|
112
|
return nil
|
113
|
}
|
113
|
}
|
114
|
|
114
|
|