mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-10 22:42:00 +02:00
Don't exit app when GetRepoPaths call fails during startup (#3779)
- **PR Description**
Fixes #3740
As explained in the issue, 7a67096
moved some code around that caused a
call to `GetRepoPaths` to occur before `setupApp`, which usually handles
the scenario where we are not in a git directory. `GetRepoPaths` returns
an error if the path isn't a git repository, which caused the app to
exit before we reached `setupApp`.
When starting up lazygit, we ignore (and log) the error returned by
`GetRepoPaths`, and continue instead of exiting early. This allows us to
reach the step where we follow the user's `notARepository` config entry.
This commit is contained in:
@@ -118,11 +118,11 @@ func NewApp(config config.AppConfigurer, test integrationTypes.IntegrationTest,
|
|||||||
return app, err
|
return app, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we're not in a repo, repoPaths will be nil. The error is moot for us
|
// If we're not in a repo, GetRepoPaths will return an error. The error is moot for us
|
||||||
// at this stage, since we'll try to init a new repo in setupRepo(), below
|
// at this stage, since we'll try to init a new repo in setupRepo(), below
|
||||||
repoPaths, err := git_commands.GetRepoPaths(app.OSCommand.Cmd, gitVersion)
|
repoPaths, err := git_commands.GetRepoPaths(app.OSCommand.Cmd, gitVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return app, err
|
common.Log.Infof("Error getting repo paths: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
showRecentRepos, err := app.setupRepo(repoPaths)
|
showRecentRepos, err := app.setupRepo(repoPaths)
|
||||||
|
Reference in New Issue
Block a user