Fix LFS file not stored in LFS when uploaded/edited via API or web UI #34367
Conversation
|
Differences between 1.23.7 and 1.24.0-rc0 / current main. Same repository, lfs works fine when pushed with git on both versions, uploading a file via web UI that is then stored in lfs according to .gitattributes only works in 1.23.7.
1.23.7 (stored in lfs) 1.24.0-rc0 / current main (not stored in lfs)
|
|
Take a look at the original implementation. It will read the git worktree rather than a PASSing |
|
I've re-added the option to use |
Can we always use |
|
|
services/repository/files/upload.go
Outdated
| @@ -107,10 +107,12 @@ func UploadRepoFiles(ctx context.Context, repo *repo_model.Repository, doer *use | |||
| } | |||
|
|
|||
| var attributesMap map[string]*attribute.Attributes | |||
| if setting.LFS.StartServer { | |||
| if setting.LFS.StartServer && hasOldBranch { | |||
There was a problem hiding this comment.
Is the hasOldBranch still necessary?
There was a problem hiding this comment.
OK, I am sure that we should not check hasOldBranch, because the "upload" should work on an empty repo, which doesn't have "old branch", while some "global gitattributes or info gitattributes" may exist.
Files that should be stored in LFS and are uploaded/edited from the API or web UI aren't stored in LFS. This may be a regression from #34154.