Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix LFS file not stored in LFS when uploaded/edited via API or web UI #34367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 10 commits into from
May 8, 2025
Merged

Fix LFS file not stored in LFS when uploaded/edited via API or web UI #34367

merged 10 commits into from
May 8, 2025
+24 −2

Conversation

bytedream
Copy link
Contributor

@bytedream bytedream commented May 4, 2025 •
edited
Loading

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.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 4, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label May 4, 2025
@bytedream bytedream changed the title Fix file not stored in LFS when uploaded/edited via API or web UI Fix LFS file not stored in LFS when uploaded/edited via API or web UI May 4, 2025
@bytedream bytedream mentioned this pull request May 5, 2025
Open
@bytedream
Copy link
Contributor Author

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.

.gitattributes
gitattrs

1.23.7 (stored in lfs)
1_23_7

1.24.0-rc0 / current main (not stored in lfs)
1_24_0_rc0

image

@lunny
Copy link
Member

lunny commented May 7, 2025

Take a look at the original implementation. It will read the git worktree rather than a HEAD branch directly. https://github.com/go-gitea/gitea/pull/34154/files#diff-eb96c4920cd1cce828a016dc1acdbf3cd320109a1c6c08f0ec5ac411c57cdc3c

PASSing HEAD will create a new temporory repository if git is lower than 2.40.

@bytedream
Copy link
Contributor Author

I've re-added the option to use --cached and read the attributes from the index (which is present for the bare repo when uploading/editing file in the web UI)

@lunny
Copy link
Member

lunny commented May 7, 2025

I've re-added the option to use --cached and read the attributes from the index (which is present for the bare repo when uploading/editing file in the web UI)

Can we always use --cached if reading from worktree or index?

@bytedream
Copy link
Contributor Author

--cached explicitly reads from the index, so if there are any unstaged changed in the worktree that affect the attributes, --cached won't include those changes in the output.
I only added it for git < 2.40, so that treeish doesn't need to be set to HEAD which would result in the creation of an unnecessary second index.

@lunny lunny added type/bug backport/v1.24 This PR should be backported to Gitea 1.24 labels May 7, 2025
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 7, 2025
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 8, 2025
@bytedream
Copy link
Contributor Author

We could add the uploaded .gitattributes thing here too, it's really trivial as you wrote @wxiaoguang, if it's okay to add such an feature in a bug fix (well it depends how one sees this, it could also be considered a bug that this doesn't work yet).

@wxiaoguang
Copy link
Contributor

I think this PR is good enough to fix the bug and to be backported for 1.24.

TBH I don't see a real case that end users would manually upload a ".gitattributes" at the moment, maybe we could leave the "improvement" to the day when someone really needs it.

@wxiaoguang wxiaoguang merged commit 2fbc8f9 into go-gitea:main May 8, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone May 8, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 8, 2025
@bytedream @wxiaoguang @GiteaBot
Fix LFS file not stored in LFS when uploaded/edited via API or web UI (…
b57a036 
…go-gitea#34367)

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 go-gitea#34154.

---------

Co-authored-by: wxiaoguang <[email protected]>
@GiteaBot GiteaBot mentioned this pull request May 8, 2025
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label May 8, 2025
lunny pushed a commit that referenced this pull request May 8, 2025
@GiteaBot @bytedream @wxiaoguang
Fix LFS file not stored in LFS when uploaded/edited via API or web UI (…
c8f3402 
…#34367) (#34396)

Backport #34367 by bytedream

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.

Co-authored-by: bytedream <[email protected]>
Co-authored-by: wxiaoguang <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 9, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
6931d42 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix autofocus behavior (go-gitea#34397)
  Fix incorrect divergence cache after switching default branch (go-gitea#34370)
  Add a button editing action secret (go-gitea#34348)
  Fix LFS file not stored in LFS when uploaded/edited via API or web UI (go-gitea#34367)
  [skip ci] Updated translations via Crowdin
  Fix "The sidebar of the repository file list does not have a fixed height go-gitea#34298" (go-gitea#34321)
  feat: add label 'state' to metric 'gitea_users' (go-gitea#34326)
  Update JS and PY dependencies (go-gitea#34391)
  Upgrade go-github v61 -> v71 (go-gitea#34385)
  Bump `@github/relative-time-element` to v4.4.7 (go-gitea#34384)
  gitignore: Visual Studio settings folder (go-gitea#34375)
  Grey out expired artifact on Artifacts list (go-gitea#34314)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.24 This PR should be backported to Gitea 1.24 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/bug
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.
4 participants
@bytedream @lunny @wxiaoguang @GiteaBot