summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-04-06 19:00:40 +1000
committerJesse Duffield <jessedduffield@gmail.com>2021-04-06 19:34:32 +1000
commit963fcc1444b6ae05a689b4827837eb0a3366bf25 (patch)
tree34b257c2009da3e35a31d7cd8e22a51775f9e835
parentc6825e3d0d4baca5fe4588a68002cbc648016f05 (diff)
don't kill the index.lock file until I decide whether it's actually a good idea
-rw-r--r--pkg/commands/git.go8
1 files changed, 0 insertions, 8 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index ebf6268b4..0c15b2788 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -221,14 +221,6 @@ func (c *GitCommand) RunCommandWithOutput(formatString string, formatArgs ...int
time.Sleep(waitTime)
if attempt < retryCount {
continue
- } else if attempt == retryCount {
- // delete the lock file because some other process must have died leaving it there
- // TODO: ensure this is the actual location of the lock
- c.Log.Warn("WARNING: removing index.lock file after retrying command 5 times")
- if err := os.Remove(".git/index.lock"); err != nil {
- return "", err
- }
- continue
}
}
}