aboutsummaryrefslogtreecommitdiff
path: root/services/pull/lfs.go
diff options
context:
space:
mode:
Diffstat (limited to 'services/pull/lfs.go')
-rw-r--r--services/pull/lfs.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/pull/lfs.go b/services/pull/lfs.go
index dc4ca006e..394337246 100644
--- a/services/pull/lfs.go
+++ b/services/pull/lfs.go
@@ -116,7 +116,7 @@ func createLFSMetaObjectsFromCatFileBatch(catFileBatchReader *io.PipeReader, wg
}
// Then we need to check that this pointer is in the db
- if _, err := git_model.GetLFSMetaObjectByOid(db.DefaultContext, pr.HeadRepo.ID, pointer.Oid); err != nil {
+ if _, err := git_model.GetLFSMetaObjectByOid(db.DefaultContext, pr.HeadRepoID, pointer.Oid); err != nil {
if err == git_model.ErrLFSObjectNotExist {
log.Warn("During merge of: %d in %-v, there is a pointer to LFS Oid: %s which although present in the LFS store is not associated with the head repo %-v", pr.Index, pr.BaseRepo, pointer.Oid, pr.HeadRepo)
continue