mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -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
|
||
|---|---|---|
| .. | ||
| app_config.go | ||
| app_config_daemon_test.go | ||
| app_config_test.go | ||
| config_default_platform.go | ||
| config_linux.go | ||
| config_windows.go | ||
| diff_renderer_config_manager.go | ||
| diff_renderer_config_manager_test.go | ||
| dummies.go | ||
| editor_presets.go | ||
| editor_presets_test.go | ||
| github_pull_request_cache.go | ||
| github_pull_request_cache_test.go | ||
| keybinding.go | ||
| keybinding_test.go | ||
| keynames.go | ||
| keynames_test.go | ||
| side_panel.go | ||
| user_config.go | ||
| user_config_validation.go | ||
| user_config_validation_test.go | ||