go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-31 23:19:40 +02:00
Code Issues Releases Activity

fix typo

Browse Source
This commit is contained in:
haowei 2019-05-22 21:34:29 +08:00 committed by Jesse Duffield
parent b60ecdaa24
commit e1f5601d4b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/branch.go
View File

@ -18,7 +18,7 @@ type Branch struct {
Selected bool Selected bool
} }
// GetDisplayStrings returns the dispaly string of branch // GetDisplayStrings returns the display string of branch
func (b *Branch) GetDisplayStrings(isFocused bool) []string { func (b *Branch) GetDisplayStrings(isFocused bool) []string {
displayName := utils.ColoredString(b.Name, b.GetColor()) displayName := utils.ColoredString(b.Name, b.GetColor())
if isFocused && b.Selected && b.Pushables != "" && b.Pullables != "" { if isFocused && b.Selected && b.Pushables != "" && b.Pullables != "" {

2
pkg/commands/git.go
View File

@ -140,7 +140,7 @@ func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filenam
return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil
} }
// GetStashEntries stash entryies // GetStashEntries stash entries
func (c *GitCommand) GetStashEntries() []*StashEntry { func (c *GitCommand) GetStashEntries() []*StashEntry {
rawString, _ := c.OSCommand.RunCommandWithOutput("git stash list --pretty='%gs'") rawString, _ := c.OSCommand.RunCommandWithOutput("git stash list --pretty='%gs'")
stashEntries := []*StashEntry{} stashEntries := []*StashEntry{}

2
pkg/commands/stash_entry.go
View File

@ -7,7 +7,7 @@ type StashEntry struct {
DisplayString string DisplayString string
} }
// GetDisplayStrings returns the dispaly string of branch // GetDisplayStrings returns the display string of branch
func (s *StashEntry) GetDisplayStrings(isFocused bool) []string { func (s *StashEntry) GetDisplayStrings(isFocused bool) []string {
return []string{s.DisplayString} return []string{s.DisplayString}
} }

2
pkg/config/app_config.go
View File

@ -196,7 +196,7 @@ func (c *AppConfig) WriteToUserConfig(key, value string) error {
return v.WriteConfig() return v.WriteConfig()
} }
// SaveAppState marhsalls the AppState struct and writes it to the disk // SaveAppState marshalls the AppState struct and writes it to the disk
func (c *AppConfig) SaveAppState() error { func (c *AppConfig) SaveAppState() error {
marshalledAppState, err := yaml.Marshal(c.AppState) marshalledAppState, err := yaml.Marshal(c.AppState)
if err != nil { if err != nil {

2
pkg/git/commit_list_builder.go
View File

@ -177,7 +177,7 @@ func (c *CommitListBuilder) getNormalRebasingCommits() ([]*commands.Commit, erro
func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*commands.Commit, error) { func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*commands.Commit, error) {
bytesContent, err := ioutil.ReadFile(fmt.Sprintf("%s/rebase-merge/git-rebase-todo", c.GitCommand.DotGitDir)) bytesContent, err := ioutil.ReadFile(fmt.Sprintf("%s/rebase-merge/git-rebase-todo", c.GitCommand.DotGitDir))
if err != nil { if err != nil {
c.Log.Info(fmt.Sprintf("error occured reading git-rebase-todo: %s", err.Error())) c.Log.Info(fmt.Sprintf("error occurred reading git-rebase-todo: %s", err.Error()))
// we assume an error means the file doesn't exist so we just return // we assume an error means the file doesn't exist so we just return
return nil, nil return nil, nil
} }