diff options
| author | Dawid Dziurla <dawidd0811@gmail.com> | 2020-01-05 21:46:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-05 21:46:15 +0100 |
| commit | 9e5acb84c0afe8da567e39f731ee82a436598b67 (patch) | |
| tree | 0eb03e4efa4a1a074e5de295bae8104e2de54d22 | |
| parent | 96ca7262e4b66e4de7cb8b4859cc2b3117bcffe8 (diff) | |
| parent | 5e45ae158442c619c09afbc442e442949fa17659 (diff) | |
Merge pull request #574 from jamiebrynes7/bugfix/apply-patch-windows
Fix applying patch on Windows machines
| -rw-r--r-- | pkg/commands/git.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 7bcc651cb..08eb78edf 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -628,7 +628,7 @@ func (c *GitCommand) Diff(file *File, plain bool, cached bool) string { 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") + filepath := filepath.Join(c.Config.GetUserConfigDir(), utils.GetCurrentRepoName(), time.Now().Format("Jan _2 15.04.05.000000000")+".patch") if err := c.OSCommand.CreateFileWithContent(filepath, patch); err != nil { return err } |