From 2866827ca8cb94bf979221429f7993b4bfbbdb50 Mon Sep 17 00:00:00 2001 From: nullishamy Date: Mon, 1 Aug 2022 17:05:16 +0100 Subject: [PATCH] Apply suggestions from code review --- pkg/app/app.go | 17 ++++++++++++++++- pkg/i18n/english.go | 2 ++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index 8f2ac1ea0..8f05679cc 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -229,7 +229,22 @@ func (app *App) setupRepo() (bool, error) { } if isBare { - log.Fatalln("bare repositories are not supported by lazygit, please make this a working repository.") + log.Println(app.Tr.BareRepo) + response, _ := bufio.NewReader(os.Stdin).ReadString('\n') + shouldOpenRecent := strings.Trim(response, " \r\n") == "y" + + if shouldOpenRecent { + for _, repoDir := range app.Config.GetAppState().RecentRepos { + if isRepo, _ := isDirectoryAGitRepository(repoDir); isRepo { + if err := os.Chdir(repoDir); err == nil { + return true, nil + } + } + } + + fmt.Println(app.Tr.NoRecentRepositories) + os.Exit(1) + } } } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index b57c1aad8..83de83f7a 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -259,6 +259,7 @@ type TranslationSet struct { DiscardFileChangesPrompt string DisabledForGPG string CreateRepo string + BareRepo string InitialBranch string NoRecentRepositories string AutoStashTitle string @@ -896,6 +897,7 @@ func EnglishTranslationSet() TranslationSet { DiscardFileChangesPrompt: "Are you sure you want to discard this commit's changes to this file? If this file was created in this commit, it will be deleted", DisabledForGPG: "Feature not available for users using GPG", CreateRepo: "Not in a git repository. Create a new git repository? (y/n): ", + BareRepo: "You've attempted to open Lazygit in a bare repo but Lazygit does not yet support bare repos. Open most recent repo? (y/n)" , InitialBranch: "Branch name? (leave empty for git's default): ", NoRecentRepositories: "Must open lazygit in a git repository. No valid recent repositories. Exiting.", AutoStashTitle: "Autostash?",