mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-11 08:06:25 -04:00
0bfa987b7a
When git invokes lazygit as a daemon during a rebase (e.g. as the
GIT_SEQUENCE_EDITOR), the child instance loaded the user config on
startup. If the config still had a pre-migration schema, it was
auto-migrated and written back to disk in the middle of the git
operation. With the config file checked in (e.g. a dotfiles repo),
this dirties the working tree mid-rebase and git aborts:
error: Your local changes to the following files would be
overwritten by merge: config.yml
The daemon doesn't need the user config for anything, so skip loading
it entirely in daemon mode: build the app config from defaults without
touching any config files, and handle the daemon instruction right
away. Normal (non-daemon) startup is unchanged.
Fixes #5998
|
||
|---|---|---|
| .. | ||
| daemon | ||
| types | ||
| app.go | ||
| entry_point.go | ||
| errors.go | ||