From 6fd80565c73fe6b61e73c36b1868472b91642fdd Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Tue, 3 Oct 2023 09:36:46 +0200 Subject: [PATCH 1/4] Band-aid fix for submodule/reset.go test failure This is not a complete fix, but it's good enough to fix the spurious test failures of submodule/reset.go. We have some vague hope to fix this in a more sustainable way by somehow improving our concurrency model fundamentally, but that's a more long-term undertaking, and it's annoying that this test fails so often, so let's fix it in this way for now. --- pkg/gui/controllers/helpers/refresh_helper.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index 578089af1..f04b102e4 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -449,9 +449,11 @@ func (self *RefreshHelper) refreshBranches() { // Need to re-render the commits view because the visualization of local // branch heads might have changed + self.c.Mutexes().LocalCommitsMutex.Lock() if err := self.c.Contexts().LocalCommits.HandleRender(); err != nil { self.c.Log.Error(err) } + self.c.Mutexes().LocalCommitsMutex.Unlock() self.refreshStatus() } From a04fbafcfd79ef6fb7eecf32a40fa3a1ce23c050 Mon Sep 17 00:00:00 2001 From: README-bot Date: Tue, 3 Oct 2023 09:35:18 +0000 Subject: [PATCH 2/4] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c1c36d4fc..14e92bcaa 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ A simple terminal UI for git commands

-Mark LussierDean HerbertPeter BjorklundReilly WoodOliver GüntherPawan DhananjayBartłomiej DachDavid KarlssonJesperCarsten GehlingCEUKAkos PutzXeteraHolden LucasCaleb UkleChau TranmatejciktheAverageDev (Luca Tumedei)Zach FullerNicholas CloudLightQuantumGabriel SaillardAliaksandr StelmachonakPedro PombeiroBurgy BenjaminJoe KlemmerAimi FadhilLinus MetzlerComplexPlaneTobias LütkeBenHollyJames SantucciJeff ForcierMaciej T. NowakMichael HuggettFarzad MajidfayyazYuraAndreas KurthBraden SteffaniakJordan GillardSebastianGeorge SpanosBen HuntAlex BradnerFrantisek StankoRobert Clancy (Robbo)Trevor ClarkAndy SlezakMartin KockChristian RackersederAndrei BaciuRégis HaubourgMichal KolasinskiSimon LieschkeBruce BaiIllarion KoperskiLeandro Abreu +Mark LussierDean HerbertPeter BjorklundReilly WoodOliver GüntherPawan DhananjayBartłomiej DachDavid KarlssonJesperCarsten GehlingCEUKAkos PutzXeteraHolden LucasCaleb UkleChau TranmatejciktheAverageDev (Luca Tumedei)Zach FullerNicholas CloudLightQuantumAliaksandr StelmachonakPedro PombeiroBurgy BenjaminJoe KlemmerAimi FadhilLinus MetzlerComplexPlaneTobias LütkeBenHollyJames SantucciJeff ForcierMaciej T. NowakMichael HuggettFarzad MajidfayyazYuraAndreas KurthBraden SteffaniakJordan GillardSebastianGeorge SpanosBen HuntAlex BradnerFrantisek StankoRobert Clancy (Robbo)Trevor ClarkAndy SlezakMartin KockChristian RackersederRégis HaubourgMichal KolasinskiSimon LieschkeBruce BaiIllarion KoperskiLeandro Abreu

## Elevator Pitch From 8390622f700afa015ca6443e5d4d7806cdb1a666 Mon Sep 17 00:00:00 2001 From: Nikita Karamov Date: Tue, 3 Oct 2023 19:07:59 +0200 Subject: [PATCH 3/4] Add Micro editor preset --- docs/Config.md | 2 +- pkg/config/editor_presets.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Config.md b/docs/Config.md index fde550baf..5bdcaed98 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -319,7 +319,7 @@ os: editPreset: 'vscode' ``` -Supported presets are `vim`, `nvim`, `nvim-remote`, `emacs`, `nano`, `vscode`, `sublime`, `bbedit`, `kakoune`, `helix`, and `xcode`. In many cases lazygit will be able to guess the right preset from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR. +Supported presets are `vim`, `nvim`, `nvim-remote`, `emacs`, `nano`, `micro`, `vscode`, `sublime`, `bbedit`, `kakoune`, `helix`, and `xcode`. In many cases lazygit will be able to guess the right preset from your $(git config core.editor), or an environment variable such as $VISUAL or $EDITOR. `nvim-remote` is an experimental preset for when you have invoked lazygit from within a neovim process, allowing lazygit to open the file from within the parent process rather than spawning a new one. diff --git a/pkg/config/editor_presets.go b/pkg/config/editor_presets.go index 17850c7a5..8509cb54b 100644 --- a/pkg/config/editor_presets.go +++ b/pkg/config/editor_presets.go @@ -60,6 +60,7 @@ func getPreset(osConfig *OSConfig, guessDefaultEditor func() string) *editPreset suspend: false, }, "emacs": standardTerminalEditorPreset("emacs"), + "micro": standardTerminalEditorPreset("micro"), "nano": standardTerminalEditorPreset("nano"), "kakoune": standardTerminalEditorPreset("kak"), "helix": { From a3759c65e419232fce6e2abf043a084f150ae671 Mon Sep 17 00:00:00 2001 From: README-bot Date: Tue, 3 Oct 2023 19:20:39 +0000 Subject: [PATCH 4/4] Updated README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14e92bcaa..b6f7f5a38 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ A simple terminal UI for git commands

-Mark LussierDean HerbertPeter BjorklundReilly WoodOliver GüntherPawan DhananjayBartłomiej DachDavid KarlssonJesperCarsten GehlingCEUKAkos PutzXeteraHolden LucasCaleb UkleChau TranmatejciktheAverageDev (Luca Tumedei)Zach FullerNicholas CloudLightQuantumAliaksandr StelmachonakPedro PombeiroBurgy BenjaminJoe KlemmerAimi FadhilLinus MetzlerComplexPlaneTobias LütkeBenHollyJames SantucciJeff ForcierMaciej T. NowakMichael HuggettFarzad MajidfayyazYuraAndreas KurthBraden SteffaniakJordan GillardSebastianGeorge SpanosBen HuntAlex BradnerFrantisek StankoRobert Clancy (Robbo)Trevor ClarkAndy SlezakMartin KockChristian RackersederRégis HaubourgMichal KolasinskiSimon LieschkeBruce BaiIllarion KoperskiLeandro Abreu +Mark LussierDean HerbertPeter BjorklundReilly WoodOliver GüntherPawan DhananjayBartłomiej DachDavid KarlssonJesperCarsten GehlingCEUKAkos PutzXeteraHolden LucasCaleb UkleChau TranmatejciktheAverageDev (Luca Tumedei)Zach FullerNicholas CloudLightQuantumAliaksandr StelmachonakPedro PombeiroBurgy BenjaminJoe KlemmerAimi FadhilLinus MetzlerComplexPlaneTobias LütkeBenHollyJames SantucciJeff ForcierMaciej T. NowakMichael HuggettFarzad MajidfayyazYuraAndreas KurthBraden SteffaniakJordan GillardSebastianGeorge SpanosBen HuntAlex BradnerFrantisek StankoRobert Clancy (Robbo)Trevor ClarkAndy SlezakMartin KockChristian RackersederRégis HaubourgMichal KolasinskiSimon LieschkeBruce BaiIllarion KoperskiLeandro Abreu

## Elevator Pitch