bump version to v0.1.68

.gitignore

@@ -1,18 +1,7 @@
-# Please do not add personal files
-
-# Logs
-*.log
-
-# Extras
+development.log
+commands.log
 extra/lgit.rb
-
-# Notes
 notes/go.notes
 TODO.notes
 TODO.md
-
-# Tests
 test/repos/repo
-
-# Binaries
-lazygit

.goreleaser.yml

@@ -13,6 +13,8 @@ builds:
       - arm
       - arm64
       - 386
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.tag={{.Tag}} -X main.date={{.Date}} -X main.commit={{.Commit}} -X "main.goos={{.Os}} -X "main.arch={{.Arch}} -X "main.arm={{.Arm}}"
 
 archive:
   replacements:

README.md

@@ -7,7 +7,7 @@ too stubborn to use Sourcetree because you'll never forgive Atlassian for making
 Jira? This is the app for you!
 
 
-![Gif](/docs/resources/lazygit-example.gif)
+![Gif](https://image.ibb.co/mmeXho/optimisedgif.gif)
 
   * [Installation](https://github.com/jesseduffield/lazygit#installation)
   * [Usage](https://github.com/jesseduffield/lazygit#usage),
@@ -90,7 +90,7 @@ whichever rc file you're using).
 
   * Basic video tutorial [here](https://www.youtube.com/watch?v=VDXvbHZYeKY).
   * List of keybindings
-[here](/docs/Keybindings.md).
+[here](https://github.com/jesseduffield/lazygit/blob/master/docs/Keybindings.md).
 
 ## Cool features
   * Adding files easily
@@ -101,10 +101,10 @@ whichever rc file you're using).
   * Squash down and rename commits
 
 ### Resolving merge conflicts
-![Gif](/docs/resources/resolving-merge-conflicts.gif)
+![Gif](https://image.ibb.co/iyxUTT/shortermerging.gif)
 
 ### Viewing commit diffs
-![Viewing Commit Diffs](/docs/resources/viewing-commit-diffs.png)
+![Viewing Commit Diffs](https://image.ibb.co/gPD02o/capture.png)
 
 ## Milestones
 - [x] Easy Installation (homebrew, release binaries)
@@ -119,7 +119,7 @@ whichever rc file you're using).
 We love your input! Please check out the [contributing guide](CONTRIBUTING.md).
 For contributor discussion about things not better discussed here in the repo, join the slack channel
 
-[![Slack](/docs/resources/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/enQtNDE3MjIwNTYyMDA0LTM3Yjk3NzdiYzhhNTA1YjM4Y2M4MWNmNDBkOTI0YTE4YjQ1ZmI2YWRhZTgwNjg2YzhhYjg3NDBlMmQyMTI5N2M)
+[![Slack](/files/slack_rgb.png)](https://join.slack.com/t/lazygit/shared_invite/enQtNDE3MjIwNTYyMDA0LTM3Yjk3NzdiYzhhNTA1YjM4Y2M4MWNmNDBkOTI0YTE4YjQ1ZmI2YWRhZTgwNjg2YzhhYjg3NDBlMmQyMTI5N2M)
 
 ## Work in progress
 This is still a work in progress so there's still bugs to iron out and as this

VERSION

@@ -1 +1 @@
-v0.1.72
+v0.1.68

main.go

@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"runtime"
 
 	"github.com/jesseduffield/lazygit/pkg/app"
 	"github.com/jesseduffield/lazygit/pkg/config"
@@ -16,6 +15,9 @@ var (
 	commit  string
 	version = "unversioned"
 	date    string
+	goos    string
+	arch    string
+	arm     string
 
 	debuggingFlag = flag.Bool("debug", false, "a boolean")
 	versionFlag   = flag.Bool("v", false, "Print the current version")
@@ -44,7 +46,7 @@ func main() {
 		version = fallbackVersion()
 	}
 	if *versionFlag {
-		fmt.Printf("commit=%s, build date=%s, version=%s, os=%s, arch=%s\n", commit, date, version, runtime.GOOS, runtime.GOARCH)
+		fmt.Printf("commit=%s, build date=%s, version=%s, os=%s, arch=%s, arm=%s\n", commit, date, version, goos, arch, arm)
 		os.Exit(0)
 	}
 	appConfig, err := config.NewAppConfig("lazygit", version, commit, date, debuggingFlag)
@@ -53,13 +55,7 @@ func main() {
 	}
 
 	app, err := app.NewApp(appConfig)
-	if err != nil {
-		// TODO: remove this call to panic after anonymous error reporting
-		// is setup (right now the call to panic logs nothing to the screen which
-		// would make debugging difficult
-		panic(err)
-		// app.Log.Panic(err.Error())
-	}
+	app.Log.Info(err)
 	app.GitCommand.SetupGit()
 	app.Gui.RunWithSubprocesses()
 }

pkg/app/app.go

@@ -48,21 +48,21 @@ func NewApp(config config.AppConfigurer) (*App, error) {
 	app.Log = newLogger(config)
 	app.OSCommand, err = commands.NewOSCommand(app.Log)
 	if err != nil {
-		return app, err
+		return nil, err
 	}
 
 	app.Tr, err = i18n.NewLocalizer(app.Log)
 	if err != nil {
-		return app, err
+		return nil, err
 	}
 
 	app.GitCommand, err = commands.NewGitCommand(app.Log, app.OSCommand)
 	if err != nil {
-		return app, err
+		return nil, err
 	}
 	app.Gui, err = gui.NewGui(app.Log, app.GitCommand, app.OSCommand, app.Tr, config)
 	if err != nil {
-		return app, err
+		return nil, err
 	}
 	return app, nil
 }

pkg/commands/git.go

@@ -81,7 +81,7 @@ func (c *GitCommand) GetStatusFiles() []File {
 		stagedChange := change[0:1]
 		unstagedChange := statusString[1:2]
 		filename := statusString[3:]
-		tracked := !includes([]string{"??", "A ", "AM"}, change)
+		tracked := !includes([]string{"??", "A "}, change)
 		file := File{
 			Name:               filename,
 			DisplayString:      statusString,
@@ -358,16 +358,11 @@ func (c *GitCommand) IsInMergeState() (bool, error) {
 // RemoveFile directly
 func (c *GitCommand) RemoveFile(file File) error {
 	// if the file isn't tracked, we assume you want to delete it
-	if file.HasStagedChanges {
-		if err := c.OSCommand.RunCommand("git reset -- " + file.Name); err != nil {
-			return err
-		}
-	}
 	if !file.Tracked {
-		return os.RemoveAll(c.OSCommand.Unquote(file.Name))
+		return os.RemoveAll(file.Name)
 	}
 	// if the file is tracked, we assume you want to just check it out
-	return c.OSCommand.RunCommand("git checkout -- " + file.Name)
+	return c.OSCommand.RunCommand("git checkout " + file.Name)
 }
 
 // Checkout checks out a branch, with --force if you set the force arg to true
@@ -486,11 +481,15 @@ func (c *GitCommand) Diff(file File) string {
 		// if the file is staged and has spaces in it, it comes pre-quoted
 		fileName = c.OSCommand.Quote(fileName)
 	}
-	trackedArg := "--"
+	deletedArg := ""
+	if file.Deleted {
+		deletedArg = "--"
+	}
+	trackedArg := ""
 	if !file.Tracked && !file.HasStagedChanges {
 		trackedArg = "--no-index /dev/null"
 	}
-	command := fmt.Sprintf("%s %s %s %s", "git diff --color ", cachedArg, trackedArg, fileName)
+	command := fmt.Sprintf("%s %s %s %s %s", "git diff --color ", cachedArg, deletedArg, trackedArg, fileName)
 
 	// for now we assume an error means the file was deleted
 	s, _ := c.OSCommand.RunCommandWithOutput(command)

pkg/commands/git_test.go

@@ -1,126 +0,0 @@
-package commands
-
-import (
-	"io/ioutil"
-	"strings"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/jesseduffield/lazygit/pkg/test"
-)
-
-func getDummyLog() *logrus.Logger {
-	log := logrus.New()
-	log.Out = ioutil.Discard
-	return log
-}
-
-func getDummyOSCommand() *OSCommand {
-	return &OSCommand{
-		Log:      getDummyLog(),
-		Platform: getPlatform(),
-	}
-}
-
-func getDummyGitCommand() *GitCommand {
-	return &GitCommand{
-		Log:       getDummyLog(),
-		OSCommand: getDummyOSCommand(),
-	}
-}
-
-func TestDiff(t *testing.T) {
-	gitCommand := getDummyGitCommand()
-	if err := test.GenerateRepo("lots_of_diffs.sh"); err != nil {
-		t.Error(err.Error())
-	}
-	files := []File{
-		{
-			Name:               "deleted_staged",
-			HasStagedChanges:   false,
-			HasUnstagedChanges: true,
-			Tracked:            true,
-			Deleted:            true,
-			HasMergeConflicts:  false,
-			DisplayString:      " D deleted_staged",
-		},
-		{
-			Name:               "\"file with space staged\"",
-			HasStagedChanges:   true,
-			HasUnstagedChanges: false,
-			Tracked:            false,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      "A  \"file with space staged\"",
-		},
-		{
-			Name:               "file with space unstaged",
-			HasStagedChanges:   false,
-			HasUnstagedChanges: true,
-			Tracked:            false,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      "?? file with space unstaged",
-		},
-		{
-			Name:               "modified_unstaged",
-			HasStagedChanges:   true,
-			HasUnstagedChanges: false,
-			Tracked:            true,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      "M  modified_unstaged",
-		},
-		{
-			Name:               "modified_staged",
-			HasStagedChanges:   false,
-			HasUnstagedChanges: true,
-			Tracked:            true,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      " M modified_staged",
-		},
-		{
-			Name:               "renamed_before -> renamed_after",
-			HasStagedChanges:   true,
-			HasUnstagedChanges: false,
-			Tracked:            true,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      "R  renamed_before -> renamed_after",
-		},
-		{
-			Name:               "untracked_unstaged",
-			HasStagedChanges:   false,
-			HasUnstagedChanges: true,
-			Tracked:            false,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      "?? untracked_unstaged",
-		},
-		{
-			Name:               "untracked_staged",
-			HasStagedChanges:   true,
-			HasUnstagedChanges: false,
-			Tracked:            false,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      "A  untracked_staged",
-		},
-		{
-			Name:               "master",
-			HasStagedChanges:   false,
-			HasUnstagedChanges: true,
-			Tracked:            false,
-			Deleted:            false,
-			HasMergeConflicts:  false,
-			DisplayString:      "?? master",
-		},
-	}
-	for _, file := range files {
-		content := gitCommand.Diff(file)
-		if strings.Contains(content, "error") {
-			t.Error("Error: diff test failed. File: " + file.Name + ", " + content)
-		}
-	}
-}

pkg/commands/os.go

@@ -167,10 +167,3 @@ func (c *OSCommand) Quote(message string) string {
 	message = strings.Replace(message, "`", "\\`", -1)
 	return c.Platform.escapedQuote + message + c.Platform.escapedQuote
 }
-
-// Unquote removes wrapping quotations marks if they are present
-// this is needed for removing quotes from staged filenames with spaces
-func (c *OSCommand) Unquote(message string) string {
-	message = strings.Replace(message, `"`, "", -1)
-	return message
-}

pkg/gui/commits_panel.go

@@ -74,7 +74,7 @@ func (gui *Gui) handleCommitSelect(g *gocui.Gui, v *gocui.View) error {
 	}
 	commit, err := gui.getSelectedCommit(g)
 	if err != nil {
-		if err.Error() != gui.Tr.SLocalize("NoCommitsThisBranch") {
+		if err != errors.New(gui.Tr.SLocalize("NoCommitsThisBranch")) {
 			return err
 		}
 		return gui.renderString(g, "main", gui.Tr.SLocalize("NoCommitsThisBranch"))

pkg/gui/files_panel.go

@@ -128,7 +128,7 @@ func (gui *Gui) handleFileRemove(g *gocui.Gui, v *gocui.View) error {
 	)
 	return gui.createConfirmationPanel(g, v, strings.Title(deleteVerb)+" file", message, func(g *gocui.Gui, v *gocui.View) error {
 		if err := gui.GitCommand.RemoveFile(file); err != nil {
-			return err
+			panic(err)
 		}
 		return gui.refreshFiles(g)
 	}, nil)

pkg/i18n/dutch.go

@@ -6,10 +6,10 @@ import (
 )
 
 // addDutch will add all dutch translations
-func addDutch(i18nObject *i18n.Bundle) error {
+func addDutch(i18nObject *i18n.Bundle) {
 
 	// add the translations
-	return i18nObject.AddMessages(language.Dutch,
+	i18nObject.AddMessages(language.Dutch,
 		&i18n.Message{
 			ID:    "NotEnoughSpace",
 			Other: "Niet genoeg ruimte om de panelen te renderen",

pkg/i18n/english.go

@@ -15,9 +15,9 @@ import (
 	"golang.org/x/text/language"
 )
 
-func addEnglish(i18nObject *i18n.Bundle) error {
+func addEnglish(i18nObject *i18n.Bundle) {
 
-	return i18nObject.AddMessages(language.English,
+	i18nObject.AddMessages(language.English,
 		&i18n.Message{
 			ID:    "NotEnoughSpace",
 			Other: "Not enough space to render panels",

pkg/i18n/i18n.go

@@ -30,7 +30,7 @@ func NewLocalizer(log *logrus.Logger) (*Localizer, error) {
 	// create a i18n bundle that can be used to add translations and other things
 	i18nBundle := &i18n.Bundle{DefaultLanguage: language.English}
 
-	addBundles(log, i18nBundle)
+	addBundles(i18nBundle)
 
 	// return the new localizer that can be used to translate text
 	i18nLocalizer := i18n.NewLocalizer(i18nBundle, userLang)
@@ -78,18 +78,7 @@ func (l *Localizer) GetLanguage() string {
 }
 
 // add translation file(s)
-func addBundles(log *logrus.Logger, i18nBundle *i18n.Bundle) {
-	err := addPolish(i18nBundle)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = addDutch(i18nBundle)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = addEnglish(i18nBundle)
-	if err != nil {
-		log.Fatal(err)
-	}
-
+func addBundles(i18nBundle *i18n.Bundle) {
+	addDutch(i18nBundle)
+	addEnglish(i18nBundle)
 }

pkg/i18n/polish.go

@@ -1,289 +0,0 @@
-package i18n
-
-import (
-	"github.com/nicksnyder/go-i18n/v2/i18n"
-	"golang.org/x/text/language"
-)
-
-func addPolish(i18nObject *i18n.Bundle) error {
-
-	return i18nObject.AddMessages(language.Polish,
-		&i18n.Message{
-			ID:    "NotEnoughSpace",
-			Other: "Za mało miejsca do wyświetlenia paneli",
-		}, &i18n.Message{
-			ID:    "DiffTitle",
-			Other: "Różnice",
-		}, &i18n.Message{
-			ID:    "FilesTitle",
-			Other: "Pliki",
-		}, &i18n.Message{
-			ID:    "BranchesTitle",
-			Other: "Gałęzie",
-		}, &i18n.Message{
-			ID:    "CommitsTitle",
-			Other: "Commity",
-		}, &i18n.Message{
-			ID:    "StashTitle",
-			Other: "Schowek",
-		}, &i18n.Message{
-			ID:    "CommitMessage",
-			Other: "Wiadomość commita",
-		}, &i18n.Message{
-			ID:    "CommitChanges",
-			Other: "commituj zmiany",
-		}, &i18n.Message{
-			ID:    "StatusTitle",
-			Other: "Status",
-		}, &i18n.Message{
-			ID:    "navigate",
-			Other: "nawiguj",
-		}, &i18n.Message{
-			ID:    "stashFiles",
-			Other: "przechowaj pliki",
-		}, &i18n.Message{
-			ID:    "open",
-			Other: "otwórz",
-		}, &i18n.Message{
-			ID:    "ignore",
-			Other: "ignoruj",
-		}, &i18n.Message{
-			ID:    "delete",
-			Other: "usuń",
-		}, &i18n.Message{
-			ID:    "toggleStaged",
-			Other: "przełącz zatwierdzenie",
-		}, &i18n.Message{
-			ID:    "refresh",
-			Other: "odśwież",
-		}, &i18n.Message{
-			ID:    "addPatch",
-			Other: "dodaj łatkę",
-		}, &i18n.Message{
-			ID:    "edit",
-			Other: "edytuj",
-		}, &i18n.Message{
-			ID:    "scroll",
-			Other: "przewiń",
-		}, &i18n.Message{
-			ID:    "abortMerge",
-			Other: "o scalaniu",
-		}, &i18n.Message{
-			ID:    "resolveMergeConflicts",
-			Other: "rozwiąż konflikty scalania",
-		}, &i18n.Message{
-			ID:    "checkout",
-			Other: "przełącz",
-		}, &i18n.Message{
-			ID:    "NoChangedFiles",
-			Other: "Brak zmienionych plików",
-		}, &i18n.Message{
-			ID:    "FileHasNoUnstagedChanges",
-			Other: "Plik nie zawiera żadnych nieopublikowanych zmian do dodania",
-		}, &i18n.Message{
-			ID:    "CannotGitAdd",
-			Other: "Nie można git add --patch nieśledzonych plików",
-		}, &i18n.Message{
-			ID:    "CantIgnoreTrackFiles",
-			Other: "Nie można zignorować nieśledzonych plików",
-		}, &i18n.Message{
-			ID:    "NoStagedFilesToCommit",
-			Other: "Brak zatwierdzonych plików do commita",
-		}, &i18n.Message{
-			ID:    "NoFilesDisplay",
-			Other: "Brak pliku do wyświetlenia",
-		}, &i18n.Message{
-			ID:    "PullWait",
-			Other: "Wciąganie zmian...",
-		}, &i18n.Message{
-			ID:    "PushWait",
-			Other: "Wypychanie zmian...",
-		}, &i18n.Message{
-			ID:    "FileNoMergeCons",
-			Other: "Ten plik nie powoduje konfliktów scalania",
-		}, &i18n.Message{
-			ID:    "SureResetHardHead",
-			Other: "Jesteś pewny, że chcesz wykonać `reset --hard HEAD`? Możesz stracić wprowadzone zmiany",
-		}, &i18n.Message{
-			ID:    "SureTo",
-			Other: "Jesteś pewny, że chcesz {{.deleteVerb}} {{.fileName}} (stracisz swoje wprowadzone zmiany)?",
-		}, &i18n.Message{
-			ID:    "AlreadyCheckedOutBranch",
-			Other: "Już przęłączono na tą gałąź",
-		}, &i18n.Message{
-			ID:    "SureForceCheckout",
-			Other: "Jesteś pewny, że chcesz wymusić przełączenie? Stracisz wszystkie lokalne zmiany",
-		}, &i18n.Message{
-			ID:    "ForceCheckoutBranch",
-			Other: "Wymuś przełączenie gałęzi",
-		}, &i18n.Message{
-			ID:    "BranchName",
-			Other: "Nazwa gałęzi",
-		}, &i18n.Message{
-			ID:    "NewBranchNameBranchOff",
-			Other: "Nazwa nowej gałęzi (gałąź na bazie {{.branchName}})",
-		}, &i18n.Message{
-			ID:    "CantDeleteCheckOutBranch",
-			Other: "Nie możesz usunąć obecnej przełączonej gałęzi!",
-		}, &i18n.Message{
-			ID:    "DeleteBranch",
-			Other: "Usuń gałąź",
-		}, &i18n.Message{
-			ID:    "DeleteBranchMessage",
-			Other: "Jesteś pewien, że chcesz usunąć gałąź {{.selectedBranchName}} ?",
-		}, &i18n.Message{
-			ID:    "CantMergeBranchIntoItself",
-			Other: "Nie możesz scalić gałęzi do samej siebie",
-		}, &i18n.Message{
-			ID:    "forceCheckout",
-			Other: "wymuś przełączenie",
-		}, &i18n.Message{
-			ID:    "merge",
-			Other: "scal",
-		}, &i18n.Message{
-			ID:    "checkoutByName",
-			Other: "przełącz używając nazwy",
-		}, &i18n.Message{
-			ID:    "newBranch",
-			Other: "nowa gałąź",
-		}, &i18n.Message{
-			ID:    "deleteBranch",
-			Other: "usuń gałąź",
-		}, &i18n.Message{
-			ID:    "NoBranchesThisRepo",
-			Other: "Brak gałęzi dla tego repozytorium",
-		}, &i18n.Message{
-			ID:    "NoTrackingThisBranch",
-			Other: "Brak śledzenia dla tej gałęzi",
-		}, &i18n.Message{
-			ID:    "CommitWithoutMessageErr",
-			Other: "Nie możesz commitować bez podania wiadomości",
-		}, &i18n.Message{
-			ID:    "CloseConfirm",
-			Other: "{{.keyBindClose}}: zamknij, {{.keyBindConfirm}}: potwierdź",
-		}, &i18n.Message{
-			ID:    "SureResetThisCommit",
-			Other: "Jesteś pewny, że chcesz zresetować ten commit?",
-		}, &i18n.Message{
-			ID:    "ResetToCommit",
-			Other: "Zresetuj, aby commitować",
-		}, &i18n.Message{
-			ID:    "squashDown",
-			Other: "ściśnij w dół",
-		}, &i18n.Message{
-			ID:    "rename",
-			Other: "przemianuj",
-		}, &i18n.Message{
-			ID:    "resetToThisCommit",
-			Other: "zresetuj do tego commita",
-		}, &i18n.Message{
-			ID:    "fixupCommit",
-			Other: "napraw commit",
-		}, &i18n.Message{
-			ID:    "NoCommitsThisBranch",
-			Other: "Brak commitów dla tej gałęzi",
-		}, &i18n.Message{
-			ID:    "OnlySquashTopmostCommit",
-			Other: "Można tylko ścisnąć najwyższy commit",
-		}, &i18n.Message{
-			ID:    "YouNoCommitsToSquash",
-			Other: "Nie masz commitów do ściśnięcia",
-		}, &i18n.Message{
-			ID:    "CantFixupWhileUnstagedChanges",
-			Other: "Nie można wykonać naprawy, kiedy istnieją niezatwierdzone zmiany",
-		}, &i18n.Message{
-			ID:    "Fixup",
-			Other: "Napraw",
-		}, &i18n.Message{
-			ID:    "SureFixupThisCommit",
-			Other: "Jesteś pewny, ze chcesz naprawić ten commit? Commit poniżej zostanie ściśnięty w górę wraz z tym",
-		}, &i18n.Message{
-			ID:    "OnlyRenameTopCommit",
-			Other: "Można przmianować tylko najwyższy commit",
-		}, &i18n.Message{
-			ID:    "RenameCommit",
-			Other: "Przemianuj commit",
-		}, &i18n.Message{
-			ID:    "PotentialErrInGetselectedCommit",
-			Other: "potencjalny błąd w getSelected Commit (niedopasowane ui i stan)",
-		}, &i18n.Message{
-			ID:    "NoCommitsThisBranch",
-			Other: "Brak commitów dla tej gałęzi",
-		}, &i18n.Message{
-			ID:    "Error",
-			Other: "Błąd",
-		}, &i18n.Message{
-			ID:    "resizingPopupPanel",
-			Other: "skalowanie wyskakującego panelu",
-		}, &i18n.Message{
-			ID:    "RunningSubprocess",
-			Other: "uruchomiony podproces",
-		}, &i18n.Message{
-			ID:    "selectHunk",
-			Other: "wybierz kawałek",
-		}, &i18n.Message{
-			ID:    "navigateConflicts",
-			Other: "nawiguj konflikty",
-		}, &i18n.Message{
-			ID:    "pickHunk",
-			Other: "wybierz kawałek",
-		}, &i18n.Message{
-			ID:    "pickBothHunks",
-			Other: "wybierz oba kawałki",
-		}, &i18n.Message{
-			ID:    "undo",
-			Other: "cofnij",
-		}, &i18n.Message{
-			ID:    "pop",
-			Other: "wyciągnij",
-		}, &i18n.Message{
-			ID:    "drop",
-			Other: "porzuć",
-		}, &i18n.Message{
-			ID:    "apply",
-			Other: "zastosuj",
-		}, &i18n.Message{
-			ID:    "NoStashEntries",
-			Other: "Brak pozycji w schowku",
-		}, &i18n.Message{
-			ID:    "StashDrop",
-			Other: "Porzuć schowek",
-		}, &i18n.Message{
-			ID:    "SureDropStashEntry",
-			Other: "Jesteś pewny, że chcesz porzucić tę pozycję w schowku?",
-		}, &i18n.Message{
-			ID:    "NoStashTo",
-			Other: "Brak schowka dla {{.method}}",
-		}, &i18n.Message{
-			ID:    "NoTrackedStagedFilesStash",
-			Other: "Nie masz śledzonych/zatwierdzonych plików do przechowania",
-		}, &i18n.Message{
-			ID:    "StashChanges",
-			Other: "Przechowaj zmiany",
-		}, &i18n.Message{
-			ID:    "IssntListOfViews",
-			Other: "{{.name}} nie jest na liście widoków",
-		}, &i18n.Message{
-			ID:    "NoViewMachingNewLineFocusedSwitchStatement",
-			Other: "Brak widoku pasującego do instrukcji przełączania newLineFocused",
-		}, &i18n.Message{
-			ID:    "settingPreviewsViewTo",
-			Other: "ustawianie poprzedniego widoku na: {{.oldViewName}}",
-		}, &i18n.Message{
-			ID:    "newFocusedViewIs",
-			Other: "nowy skupiony widok to {{.newFocusedView}}",
-		}, &i18n.Message{
-			ID:    "CantCloseConfirmationPrompt",
-			Other: "Nie można zamknąć monitu potwierdzenia: {{.error}}",
-		}, &i18n.Message{
-			ID:    "NoChangedFiles",
-			Other: "Brak zmienionych plików",
-		}, &i18n.Message{
-			ID:    "ClearFilePanel",
-			Other: "Wyczyść panel plików",
-		}, &i18n.Message{
-			ID:    "MergeAborted",
-			Other: "Scalanie anulowane",
-		},
-	)
-}

pkg/test/test.go

@@ -1,25 +0,0 @@
-package test
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-
-	"github.com/jesseduffield/lazygit/pkg/utils"
-)
-
-// GenerateRepo generates a repo from test/repos and changes the directory to be
-// inside the newly made repo
-func GenerateRepo(filename string) error {
-	testPath := utils.GetProjectRoot() + "/test/repos/"
-	if err := os.Chdir(testPath); err != nil {
-		return err
-	}
-	if output, err := exec.Command("bash", filename).CombinedOutput(); err != nil {
-		return errors.New(string(output))
-	}
-	if err := os.Chdir(testPath + "repo"); err != nil {
-		return err
-	}
-	return nil
-}

pkg/utils/utils.go

@@ -63,14 +63,3 @@ func TrimTrailingNewline(str string) string {
 	}
 	return str
 }
-
-// GetProjectRoot returns the path to the root of the project. Only to be used
-// in testing contexts, as with binaries it's unlikely this path will exist on
-// the machine
-func GetProjectRoot() string {
-	dir, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-	return strings.Split(dir, "lazygit")[0] + "lazygit"
-}

test/repos/case_insensitive_checkouts.sh

@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo
 
 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
 
 touch foo
 git add foo

test/repos/gpg.sh

@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo
 
 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
 
 git config gpg.program $(which gpg)
 git config user.signingkey E304229F # test key

test/repos/lots_of_commits.sh

@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo
 
 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
 
 i=2
 end=100

test/repos/lots_of_diffs.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-set -ex; rm -rf repo; mkdir repo; cd repo
-
-git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
-
-echo "deleted" > deleted_staged
-echo "deleted_unstaged" > deleted_unstaged
-echo "modified_staged" > modified_staged
-echo "modified_unstaged" > modified_unstaged
-echo "renamed" > renamed_before
-
-git add .
-git commit -m "files to delete"
-rm deleted_staged
-rm deleted_unstaged
-
-rm renamed_before
-echo "renamed" > renamed_after
-echo "more" >> modified_staged
-echo "more" >> modified_unstaged
-echo "untracked_staged" > untracked_staged
-echo "untracked_unstaged" > untracked_unstaged
-echo "blah" > "file with space staged"
-echo "blah" > "file with space unstaged"
-echo "same name as branch" > master
-
-git add deleted_staged
-git add modified_staged
-git add untracked_staged
-git add "file with space staged"
-git add renamed_before
-git add renamed_after

test/repos/merge_conflict.sh

@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo
 
 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
 
 function add_spacing {
   for i in {1..60}

test/repos/pre_commit_hook.sh

@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo
 
 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
 cp ../extras/pre-commit .git/hooks/pre-commit
 chmod +x .git/hooks/pre-commit
 

test/repos/unicode_characters.sh

@@ -2,9 +2,6 @@
 set -ex; rm -rf repo; mkdir repo; cd repo
 
 git init
-git config user.email "test@example.com"
-git config user.name "Lazygit Tester"
-
 
 # Add some ansi, unicode, zero width joiner caracters
 cat <<EOT >> charstest.txt