utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 07:36:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change expected sha for DiscardOldFileChanges

Browse source
This commit is contained in:
Peter Lundberg 2019-04-07 14:25:17 +02:00 committed by Jesse Duffield
parent 7ff07e1454
commit fc3a57b5e2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/commands/git.go
View file

@ -860,7 +860,7 @@ func (c *GitCommand) DiscardOldFileChanges(commits []*Commit, commitIndex int, f
return err
}
cmd, err := c.PrepareInteractiveRebaseCommand(sha+"^", todo, true)
cmd, err := c.PrepareInteractiveRebaseCommand(sha, todo, true)
if err != nil {
return err
}

2
pkg/commands/git_test.go
View file

@ -1817,7 +1817,7 @@ func TestGitCommandDiscardOldFileChanges(t *testing.T) {
"test999.txt",
test.CreateMockCommand(t, []*test.CommandSwapper{
{
Expect: "git rebase --interactive --autostash 123456^",
Expect: "git rebase --interactive --autostash abcdef",
Replace: "echo",
},
{