diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-09 15:54:29 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-15 09:45:55 +0300 |
| commit | 866de7eaa00a2b15ed09ea50d88250ff20554921 (patch) | |
| tree | 4c276c3e70e5d7d0accb302c846a0847362ca129 /cmd/gitaly-git2go | |
| parent | 6661350509f7980237c9634d5f94b2a9f9149713 (diff) | |
git2go: Properly set signature dates when merging
In case no author date is given for gitaly-git2go's merge subcommand, we
should use the current time.
Diffstat (limited to 'cmd/gitaly-git2go')
| -rw-r--r-- | cmd/gitaly-git2go/merge.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/gitaly-git2go/merge.go b/cmd/gitaly-git2go/merge.go index 1e5c13aa4..e00fe927b 100644 --- a/cmd/gitaly-git2go/merge.go +++ b/cmd/gitaly-git2go/merge.go @@ -79,7 +79,7 @@ func (cmd *mergeSubcommand) Run() error { return fmt.Errorf("invalid options: %w", err) } - var date time.Time + var date time.Time = time.Now() if cmd.authorDate != "" { var err error date, err = time.Parse("Mon Jan 2 15:04:05 2006 -0700", cmd.authorDate) |