1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-17 14:11:02 +02:00

clear patch after successful patch operation

This commit is contained in:
Jesse Duffield 2019-11-05 11:56:29 +11:00
parent f285d80d0e
commit 733145d132

View File

@ -21,6 +21,11 @@ func (c *GitCommand) DeletePatchesFromCommit(commits []*Commit, commitIndex int,
return err
}
c.onSuccessfulContinue = func() error {
c.PatchManager = nil
return nil
}
// continue
return c.GenericMerge("rebase", "continue")
}
@ -44,6 +49,11 @@ func (c *GitCommand) MovePatchToSelectedCommit(commits []*Commit, sourceCommitId
return err
}
c.onSuccessfulContinue = func() error {
c.PatchManager = nil
return nil
}
// continue
return c.GenericMerge("rebase", "continue")
}
@ -110,6 +120,11 @@ func (c *GitCommand) MovePatchToSelectedCommit(commits []*Commit, sourceCommitId
return err
}
c.onSuccessfulContinue = func() error {
c.PatchManager = nil
return nil
}
return c.GenericMerge("rebase", "continue")
}
@ -146,6 +161,7 @@ func (c *GitCommand) PullPatchIntoIndex(commits []*Commit, commitIdx int, p *Pat
return err
}
c.PatchManager = nil
return nil
}