go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Code Issues Releases Activity

fix issue where you couldn't rearrange commits while rebasing onto a branch

Browse Source
This commit is contained in:
Jesse Duffield
2019-03-02 20:57:18 +11:00
parent 790235f64b
commit 273678f081
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/commands/git.go
View File

@ -715,14 +715,7 @@ func (c *GitCommand) EditRebaseTodo(index int, action string) error {
} }
content := strings.Split(string(bytes), "\n") content := strings.Split(string(bytes), "\n")
commitCount := c.getTodoCommitCount(content)
// count lines that are not blank and are not comments
commitCount := 0
for _, line := range content {
if line != "" && !strings.HasPrefix(line, "#") {
commitCount++
}
}
// we have the most recent commit at the bottom whereas the todo file has // we have the most recent commit at the bottom whereas the todo file has
// it at the bottom, so we need to subtract our index from the commit count // it at the bottom, so we need to subtract our index from the commit count
@ -734,6 +727,17 @@ func (c *GitCommand) EditRebaseTodo(index int, action string) error {
return ioutil.WriteFile(fileName, []byte(result), 0644) return ioutil.WriteFile(fileName, []byte(result), 0644)
} }
func (c *GitCommand) getTodoCommitCount(content []string) int {
// count lines that are not blank and are not comments
commitCount := 0
for _, line := range content {
if line != "" && !strings.HasPrefix(line, "#") {
commitCount++
}
}
return commitCount
}
// MoveTodoDown moves a rebase todo item down by one position // MoveTodoDown moves a rebase todo item down by one position
func (c *GitCommand) MoveTodoDown(index int) error { func (c *GitCommand) MoveTodoDown(index int) error {
fileName := ".git/rebase-merge/git-rebase-todo" fileName := ".git/rebase-merge/git-rebase-todo"
@ -743,7 +747,8 @@ func (c *GitCommand) MoveTodoDown(index int) error {
} }
content := strings.Split(string(bytes), "\n") content := strings.Split(string(bytes), "\n")
contentIndex := len(content) - 2 - index commitCount := c.getTodoCommitCount(content)
contentIndex := commitCount - 1 - index
rearrangedContent := append(content[0:contentIndex-1], content[contentIndex], content[contentIndex-1]) rearrangedContent := append(content[0:contentIndex-1], content[contentIndex], content[contentIndex-1])
rearrangedContent = append(rearrangedContent, content[contentIndex+1:]...) rearrangedContent = append(rearrangedContent, content[contentIndex+1:]...)