Skip to content
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

Fix lfs migration #32812

Merged
merged 4 commits into from
Dec 12, 2024
Merged

Fix lfs migration #32812

merged 4 commits into from
Dec 12, 2024
+3 −1

Conversation

hiifong
Copy link
Member

@hiifong hiifong commented Dec 12, 2024

Fix: #32803
image
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 12, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 12, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 12, 2024
@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Dec 12, 2024
@lunny lunny added this to the 1.23.0 milestone Dec 12, 2024
@lunny
Copy link
Member

lunny commented Dec 12, 2024

I can confirm this PR fixed the bug. It's better to have some comments on the changed lines and have some tests.

@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 Dec 12, 2024
@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 Dec 12, 2024
@techknowlogick techknowlogick enabled auto-merge (squash) December 12, 2024 20:46
@techknowlogick techknowlogick added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 12, 2024
@techknowlogick techknowlogick merged commit 0b8a894 into go-gitea:main Dec 12, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 12, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Dec 13, 2024
@hiifong @GiteaBot
Fix lfs migration (go-gitea#32812)
887ee4d 
Fix: go-gitea#32803
@GiteaBot GiteaBot mentioned this pull request Dec 13, 2024
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Dec 13, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 13, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
8e00dc0 
* giteaofficial/main:
  Fix bug of branch/tag selector in the issue sidebar (go-gitea#32744)
  Fix lfs migration (go-gitea#32812)
  Avoid MacOS keychain dialog in integration tests (go-gitea#32813)
  Update actionlint.yaml
  Detect whether action view branch was deleted (go-gitea#32764)
  Add "n commits" link to contributors in contributors graph page (go-gitea#32799)
  Fix "unicode escape" JS error (go-gitea#32806)
  use dedicated runners for release artifacts (go-gitea#32811)
  Make API "compare" accept commit IDs (go-gitea#32801)
  Implement update branch API (go-gitea#32433)
  Fix JS error when dropping a file to a editor without dropzone (go-gitea#32804)
  chore: use errors.New to replace fmt.Errorf with no parameters (go-gitea#32800)
lunny pushed a commit that referenced this pull request Dec 13, 2024
@GiteaBot @hiifong
Fix lfs migration (#32812) (#32818)
e7de2fc 
Backport #32812 by @hiifong

Fix: #32803

![image](https://github.com/user-attachments/assets/3ea1f4e0-e26f-4a15-957e-dd6caf91deb1)

![image](https://github.com/user-attachments/assets/44b99624-c347-4f2d-a11c-13ec1276eea2)

Co-authored-by: hiifong <[email protected]>
@hiifong
Copy link
Member Author

hiifong commented Dec 13, 2024

I can confirm this PR fixed the bug. It's better to have some comments on the changed lines and have some tests.

Maybe we can set the User-Agent to git-lfs/3.6.0 (GitHub; darwin arm64; go 1.23.3) so it looks more like real.

@lunny
Copy link
Member

lunny commented Dec 13, 2024

I can confirm this PR fixed the bug. It's better to have some comments on the changed lines and have some tests.

Maybe we can set the User-Agent to git-lfs/3.6.0 (GitHub; darwin arm64; go 1.23.3) so it looks more like real.

Why Github? Since the git lfs client inside Gitea is a new implementation, the version is also not right. Maybe we can use Gitea's version instead. So likely git-lfs/1.22.6 (Gitea; darwin arm64; go 1.23.3).

@hiifong
Copy link
Member Author

hiifong commented Dec 13, 2024

I can confirm this PR fixed the bug. It's better to have some comments on the changed lines and have some tests.

Maybe we can set the User-Agent to git-lfs/3.6.0 (GitHub; darwin arm64; go 1.23.3) so it looks more like real.

Why Github? Since the git lfs client inside Gitea is a new implementation, the version is also not right. Maybe we can use Gitea's version instead. So likely git-lfs/1.22.6 (Gitea; darwin arm64; go 1.23.3).

Agree

@hiifong hiifong mentioned this pull request Dec 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delvh delvh delvh approved these changes

@techknowlogick techknowlogick techknowlogick 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.22 This PR should be backported to Gitea 1.22 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 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

LFS mirroring fails with some target site
5 participants
@hiifong @lunny @techknowlogick @delvh @GiteaBot