mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-03-05 15:15:49 +02:00
don't kill the index.lock file until I decide whether it's actually a good idea
This commit is contained in:
parent
c6825e3d0d
commit
963fcc1444
@ -221,14 +221,6 @@ func (c *GitCommand) RunCommandWithOutput(formatString string, formatArgs ...int
|
|||||||
time.Sleep(waitTime)
|
time.Sleep(waitTime)
|
||||||
if attempt < retryCount {
|
if attempt < retryCount {
|
||||||
continue
|
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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user