From b9b2f58bc85edc88c6673e26e8cd88190e2fb8cf Mon Sep 17 00:00:00 2001 From: nullishamy Date: Mon, 1 Aug 2022 17:41:20 +0100 Subject: [PATCH] Format, bug fixes --- pkg/app/app.go | 4 +++- pkg/i18n/english.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/app/app.go b/pkg/app/app.go index 8f05679cc..46d1831b0 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -229,7 +229,7 @@ func (app *App) setupRepo() (bool, error) { } if isBare { - log.Println(app.Tr.BareRepo) + fmt.Print(app.Tr.BareRepo) response, _ := bufio.NewReader(os.Stdin).ReadString('\n') shouldOpenRecent := strings.Trim(response, " \r\n") == "y" @@ -245,6 +245,8 @@ func (app *App) setupRepo() (bool, error) { fmt.Println(app.Tr.NoRecentRepositories) os.Exit(1) } + + os.Exit(0) } } diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 83de83f7a..aafd89de7 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -259,7 +259,7 @@ type TranslationSet struct { DiscardFileChangesPrompt string DisabledForGPG string CreateRepo string - BareRepo string + BareRepo string InitialBranch string NoRecentRepositories string AutoStashTitle string @@ -897,7 +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)" , + 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?",