Skip to content

Commit 2d972cf

Browse files
fix lint
1 parent 2976622 commit 2d972cf

File tree

1 file changed

+25
-15
lines changed

1 file changed

+25
-15
lines changed

modules/git/git.go

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,29 @@ func InitFull(ctx context.Context) (err error) {
201201
return syncGitConfig()
202202
}
203203

204+
func enableReflogs() error {
205+
if err := configSet("core.logAllRefUpdates", "true"); err != nil {
206+
return err
207+
}
208+
if setting.Git.Reflog.Expiration != 90 {
209+
if err := configSet("gc.reflogExpire", fmt.Sprintf("%d", setting.Git.Reflog.Expiration)); err != nil {
210+
return err
211+
}
212+
} else if err := configUnsetAll("gc.reflogExpire", ""); err != nil {
213+
return err
214+
}
215+
return nil
216+
}
217+
218+
func disableReflogs() error {
219+
if err := configUnsetAll("core.logAllRefUpdates", "true"); err != nil {
220+
return err
221+
} else if err := configUnsetAll("gc.reflogExpire", ""); err != nil {
222+
return err
223+
}
224+
return nil
225+
}
226+
204227
// syncGitConfig only modifies gitconfig, won't change global variables (otherwise there will be data-race problem)
205228
func syncGitConfig() (err error) {
206229
if err = os.MkdirAll(HomeDir(), os.ModePerm); err != nil {
@@ -225,25 +248,12 @@ func syncGitConfig() (err error) {
225248
}
226249

227250
if setting.Git.Reflog.Enabled {
228-
if err := configSet("core.logAllRefUpdates", "true"); err != nil {
251+
if err := enableReflogs(); err != nil {
229252
return err
230253
}
231-
if setting.Git.Reflog.Expiration != 90 {
232-
if err := configSet("gc.reflogExpire", fmt.Sprintf("%d", setting.Git.Reflog.Expiration)); err != nil {
233-
return err
234-
}
235-
} else {
236-
if err := configUnsetAll("gc.reflogExpire", ""); err != nil {
237-
return err
238-
}
239-
}
240254
} else {
241-
if err := configUnsetAll("core.logAllRefUpdates", "true"); err != nil {
255+
if err := disableReflogs(); err != nil {
242256
return err
243-
} else {
244-
if err := configUnsetAll("gc.reflogExpire", ""); err != nil {
245-
return err
246-
}
247257
}
248258
}
249259

0 commit comments

Comments
 (0)