Skip to content

Commit 4284585

Browse files
committed
make sure Date NOT nil
1 parent 49064a4 commit 4284585

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

modules/repofiles/delete.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,12 @@ func DeleteRepoFile(repo *models.Repository, doer *models.User, opts *DeleteRepo
169169
}
170170

171171
// Now commit the tree
172-
commitHash, err := t.CommitTreeWithDate(author, committer, treeHash, message, opts.Dates.Author, opts.Dates.Commiter)
172+
var commitHash string
173+
if opts.Dates != nil {
174+
commitHash, err = t.CommitTreeWithDate(author, committer, treeHash, message, opts.Dates.Author, opts.Dates.Commiter)
175+
} else {
176+
commitHash, err = t.CommitTree(author, committer, treeHash, message)
177+
}
173178
if err != nil {
174179
return nil, err
175180
}

modules/repofiles/update.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,12 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up
379379
}
380380

381381
// Now commit the tree
382-
commitHash, err := t.CommitTreeWithDate(author, committer, treeHash, message, opts.Dates.Author, opts.Dates.Commiter)
382+
var commitHash string
383+
if opts.Dates != nil {
384+
commitHash, err = t.CommitTreeWithDate(author, committer, treeHash, message, opts.Dates.Author, opts.Dates.Commiter)
385+
} else {
386+
commitHash, err = t.CommitTree(author, committer, treeHash, message)
387+
}
383388
if err != nil {
384389
return nil, err
385390
}

0 commit comments

Comments
 (0)