sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

better interface for ApplyPatch function

Browse Source
This commit is contained in:
Jesse Duffield
2019-11-05 18:44:46 +11:00
parent db8c398fa3
commit 72fe770974
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/commands/git.go
View File

@ -613,24 +613,19 @@ func (c *GitCommand) Diff(file *File, plain bool, cached bool) string {
return s
}
func (c *GitCommand) ApplyPatch(patch string, reverse bool, cached bool, extraFlags string) error {
func (c *GitCommand) ApplyPatch(patch string, flags ...string) error {
c.Log.Warn(patch)
filepath := filepath.Join(c.Config.GetUserConfigDir(), utils.GetCurrentRepoName(), time.Now().Format(time.StampNano)+".patch")
if err := c.OSCommand.CreateFileWithContent(filepath, patch); err != nil {
return err
}
reverseFlag := ""
if reverse {
reverseFlag = "--reverse"
flagStr := ""
for _, flag := range flags {
flagStr += " --" + flag
}
cachedFlag := ""
if cached {
cachedFlag = "--cached"
}
return c.OSCommand.RunCommand(fmt.Sprintf("git apply %s %s %s %s", cachedFlag, reverseFlag, extraFlags, c.OSCommand.Quote(filepath)))
return c.OSCommand.RunCommand(fmt.Sprintf("git apply %s %s", flagStr, c.OSCommand.Quote(filepath)))
}
func (c *GitCommand) FastForward(branchName string) error {