diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-17 10:29:53 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-09-21 11:44:48 +0300 |
| commit | 295c3b7c65a88205a4aef33e6ad0e625d7ba3123 (patch) | |
| tree | a30e849d9173ffd4795c041e9ad25398f068edf5 /internal/git2go | |
| parent | 70e3be10d7e3181d342ed3bfa9346b922f8a9570 (diff) | |
git2go: Pass author date to merge command as `time.Time`
Now that we're using a JSON-serialized structure to pass data to
gitaly-git2go, we can use more typing. So let's convert from using a
time string to passing around `time.Time` instead.
Diffstat (limited to 'internal/git2go')
| -rw-r--r-- | internal/git2go/merge.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/internal/git2go/merge.go b/internal/git2go/merge.go index 946037812..b901353af 100644 --- a/internal/git2go/merge.go +++ b/internal/git2go/merge.go @@ -10,6 +10,7 @@ import ( "os/exec" "path" "strings" + "time" "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" @@ -29,7 +30,7 @@ type MergeCommand struct { // AuthorMail is the author mail of merge commit. AuthorMail string `json:"author_mail"` // AuthorDate is the auithor date of merge commit. - AuthorDate string `json:"author_date"` + AuthorDate time.Time `json:"author_date"` // Message is the message to be used for the merge commit. Message string `json:"message"` // Ours is the commit that is to be merged into theirs. |