mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-17 01:42:45 +02:00
Change default of git.log.showGraph to 'always' (#3314)
Change default of git.log.showGraph to 'always'; most people seem to prefer it to be on. Fixes #3312.
This commit is contained in:
@ -104,7 +104,7 @@ git:
|
|||||||
order: 'topo-order'
|
order: 'topo-order'
|
||||||
# one of always, never, when-maximised
|
# one of always, never, when-maximised
|
||||||
# this determines whether the git graph is rendered in the commits panel
|
# this determines whether the git graph is rendered in the commits panel
|
||||||
showGraph: 'when-maximised'
|
showGraph: 'always'
|
||||||
# displays the whole git graph by default in the commits panel (equivalent to passing the `--all` argument to `git log`)
|
# displays the whole git graph by default in the commits panel (equivalent to passing the `--all` argument to `git log`)
|
||||||
showWholeGraph: false
|
showWholeGraph: false
|
||||||
skipHookPrefix: WIP
|
skipHookPrefix: WIP
|
||||||
|
@ -662,7 +662,7 @@ func GetDefaultConfig() *UserConfig {
|
|||||||
},
|
},
|
||||||
Log: LogConfig{
|
Log: LogConfig{
|
||||||
Order: "topo-order",
|
Order: "topo-order",
|
||||||
ShowGraph: "when-maximised",
|
ShowGraph: "always",
|
||||||
ShowWholeGraph: false,
|
ShowWholeGraph: false,
|
||||||
},
|
},
|
||||||
SkipHookPrefix: "WIP",
|
SkipHookPrefix: "WIP",
|
||||||
|
@ -14,7 +14,9 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
NewBranch("mybranch").
|
NewBranch("mybranch").
|
||||||
CreateNCommits(10)
|
CreateNCommits(10)
|
||||||
},
|
},
|
||||||
SetupConfig: func(cfg *config.AppConfig) {},
|
SetupConfig: func(cfg *config.AppConfig) {
|
||||||
|
cfg.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
|
},
|
||||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
markCommitAsBad := func() {
|
markCommitAsBad := func() {
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
|
@ -14,7 +14,9 @@ var ChooseTerms = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
NewBranch("mybranch").
|
NewBranch("mybranch").
|
||||||
CreateNCommits(10)
|
CreateNCommits(10)
|
||||||
},
|
},
|
||||||
SetupConfig: func(cfg *config.AppConfig) {},
|
SetupConfig: func(cfg *config.AppConfig) {
|
||||||
|
cfg.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
|
},
|
||||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
markCommitAsFixed := func() {
|
markCommitAsFixed := func() {
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
|
@ -13,7 +13,9 @@ var Skip = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
shell.
|
shell.
|
||||||
CreateNCommits(10)
|
CreateNCommits(10)
|
||||||
},
|
},
|
||||||
SetupConfig: func(cfg *config.AppConfig) {},
|
SetupConfig: func(cfg *config.AppConfig) {
|
||||||
|
cfg.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
|
},
|
||||||
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
Run: func(t *TestDriver, keys config.KeybindingConfig) {
|
||||||
t.Views().Commits().
|
t.Views().Commits().
|
||||||
Focus().
|
Focus().
|
||||||
|
@ -9,7 +9,9 @@ var CherryPickDuringRebase = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
Description: "Cherry pick commits from the subcommits view during a rebase",
|
Description: "Cherry pick commits from the subcommits view during a rebase",
|
||||||
ExtraCmdArgs: []string{},
|
ExtraCmdArgs: []string{},
|
||||||
Skip: false,
|
Skip: false,
|
||||||
SetupConfig: func(config *config.AppConfig) {},
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
|
config.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
|
},
|
||||||
SetupRepo: func(shell *Shell) {
|
SetupRepo: func(shell *Shell) {
|
||||||
shell.
|
shell.
|
||||||
EmptyCommit("base").
|
EmptyCommit("base").
|
||||||
|
@ -12,6 +12,7 @@ var DropTodoCommitWithUpdateRef = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
GitVersion: AtLeast("2.38.0"),
|
GitVersion: AtLeast("2.38.0"),
|
||||||
SetupConfig: func(config *config.AppConfig) {
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
||||||
|
config.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
},
|
},
|
||||||
SetupRepo: func(shell *Shell) {
|
SetupRepo: func(shell *Shell) {
|
||||||
shell.
|
shell.
|
||||||
|
@ -12,6 +12,7 @@ var QuickStartKeepSelection = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
GitVersion: AtLeast("2.38.0"),
|
GitVersion: AtLeast("2.38.0"),
|
||||||
SetupConfig: func(config *config.AppConfig) {
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
||||||
|
config.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
},
|
},
|
||||||
SetupRepo: func(shell *Shell) {
|
SetupRepo: func(shell *Shell) {
|
||||||
shell.
|
shell.
|
||||||
|
@ -12,6 +12,7 @@ var QuickStartKeepSelectionRange = NewIntegrationTest(NewIntegrationTestArgs{
|
|||||||
GitVersion: AtLeast("2.38.0"),
|
GitVersion: AtLeast("2.38.0"),
|
||||||
SetupConfig: func(config *config.AppConfig) {
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
config.GetUserConfig().Git.MainBranches = []string{"master"}
|
||||||
|
config.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
},
|
},
|
||||||
SetupRepo: func(shell *Shell) {
|
SetupRepo: func(shell *Shell) {
|
||||||
shell.
|
shell.
|
||||||
|
@ -9,7 +9,9 @@ var DoNotShowBranchMarkersInReflogSubcommits = NewIntegrationTest(NewIntegration
|
|||||||
Description: "Verify that no branch heads are shown in the subcommits view of a reflog entry",
|
Description: "Verify that no branch heads are shown in the subcommits view of a reflog entry",
|
||||||
ExtraCmdArgs: []string{},
|
ExtraCmdArgs: []string{},
|
||||||
Skip: false,
|
Skip: false,
|
||||||
SetupConfig: func(config *config.AppConfig) {},
|
SetupConfig: func(config *config.AppConfig) {
|
||||||
|
config.UserConfig.Git.Log.ShowGraph = "never"
|
||||||
|
},
|
||||||
SetupRepo: func(shell *Shell) {
|
SetupRepo: func(shell *Shell) {
|
||||||
shell.NewBranch("branch1")
|
shell.NewBranch("branch1")
|
||||||
shell.EmptyCommit("one")
|
shell.EmptyCommit("one")
|
||||||
|
@ -530,7 +530,7 @@
|
|||||||
"when-maximised"
|
"when-maximised"
|
||||||
],
|
],
|
||||||
"description": "This determines whether the git graph is rendered in the commits panel\nOne of 'always' | 'never' | 'when-maximised'",
|
"description": "This determines whether the git graph is rendered in the commits panel\nOne of 'always' | 'never' | 'when-maximised'",
|
||||||
"default": "when-maximised"
|
"default": "always"
|
||||||
},
|
},
|
||||||
"showWholeGraph": {
|
"showWholeGraph": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
|
Reference in New Issue
Block a user