Skip to content

Commit 764faef

Browse files
committed
Remove unnecessary timout
1 parent 56c85a3 commit 764faef

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

modules/git/git.go

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,6 @@ func Init(ctx context.Context) error {
144144
globalCommandArgs = append(globalCommandArgs, "-c", "uploadpack.allowfilter=true", "-c", "uploadpack.allowAnySHA1InWant=true")
145145
}
146146

147-
// Save current git version on init to gitVersion otherwise it would require an RWMutex
148-
if err := LoadGitVersion(); err != nil {
149-
return err
150-
}
151-
152147
// Git requires setting user.name and user.email in order to commit changes - if they're not set just add some defaults
153148
for configKey, defaultValue := range map[string]string{"user.name": "Gitea", "user.email": "[email protected]"} {
154149
if err := checkAndSetConfig(configKey, defaultValue, false); err != nil {
@@ -230,9 +225,8 @@ func checkAndSetConfig(key, defaultValue string, forceToDefault bool) error {
230225
if err := NewCommand(DefaultContext, "config", "--get", key).
231226
SetDescription("git.Init(get setting)").
232227
Run(&git_cmd.RunOpts{
233-
Timeout: -1,
234-
Stdout: &stdout,
235-
Stderr: &stderr,
228+
Stdout: &stdout,
229+
Stderr: &stderr,
236230
}); err != nil {
237231
eerr, ok := err.(*exec.ExitError)
238232
if !ok || eerr.ExitCode() != 1 {
@@ -250,8 +244,7 @@ func checkAndSetConfig(key, defaultValue string, forceToDefault bool) error {
250244
if err := NewCommand(DefaultContext, "config", "--global", key, defaultValue).
251245
SetDescription(fmt.Sprintf("git.Init(set %s)", key)).
252246
Run(&git_cmd.RunOpts{
253-
Timeout: -1,
254-
Stderr: &stderr,
247+
Stderr: &stderr,
255248
}); err != nil {
256249
return fmt.Errorf("failed to set git %s(%s): %s", key, err, stderr.String())
257250
}
@@ -268,9 +261,8 @@ func checkAndAddConfig(key, value string) error {
268261
if err := NewCommand(DefaultContext, "config", "--get", key).
269262
SetDescription("git.Init(get setting)").
270263
Run(&git_cmd.RunOpts{
271-
Timeout: -1,
272-
Stdout: &stdout,
273-
Stderr: &stderr,
264+
Stdout: &stdout,
265+
Stderr: &stderr,
274266
}); err != nil {
275267
eerr, ok := err.(*exec.ExitError)
276268
if !ok || eerr.ExitCode() != 1 {
@@ -281,8 +273,7 @@ func checkAndAddConfig(key, value string) error {
281273
if err := NewCommand(DefaultContext, "config", "--global", "--add", key, value).
282274
SetDescription(fmt.Sprintf("git.Init(set %s)", key)).
283275
Run(&git_cmd.RunOpts{
284-
Timeout: -1,
285-
Stderr: &stderr,
276+
Stderr: &stderr,
286277
}); err != nil {
287278
return fmt.Errorf("failed to set git %s(%s): %s", key, err, stderr.String())
288279
}
@@ -300,8 +291,7 @@ func checkAndRemoveConfig(key, value string) error {
300291
if err := NewCommand(DefaultContext, "config", "--get", key, value).
301292
SetDescription("git.Init(get setting)").
302293
Run(&git_cmd.RunOpts{
303-
Timeout: -1,
304-
Stderr: &stderr,
294+
Stderr: &stderr,
305295
}); err != nil {
306296
eerr, ok := err.(*exec.ExitError)
307297
if !ok || eerr.ExitCode() != 1 {
@@ -316,8 +306,7 @@ func checkAndRemoveConfig(key, value string) error {
316306
if err := NewCommand(DefaultContext, "config", "--global", "--unset-all", key, value).
317307
SetDescription(fmt.Sprintf("git.Init(set %s)", key)).
318308
Run(&git_cmd.RunOpts{
319-
Timeout: -1,
320-
Stderr: &stderr,
309+
Stderr: &stderr,
321310
}); err != nil {
322311
return fmt.Errorf("failed to set git %s(%s): %s", key, err, stderr.String())
323312
}

0 commit comments

Comments
 (0)