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

Treat git object mode 40755 as directory #21195

Merged
merged 2 commits into from
Sep 18, 2022
Merged

Treat git object mode 40755 as directory #21195

merged 2 commits into from
Sep 18, 2022

Conversation

wxiaoguang
Copy link
Contributor

Git uses 040000 for tree object, but some users may get 040755 for unknown reasons

Try to fix #21190

@wxiaoguang wxiaoguang added this to the 1.18.0 milestone Sep 17, 2022
@wxiaoguang wxiaoguang mentioned this pull request Sep 17, 2022
Closed
@wxiaoguang wxiaoguang changed the title Treat git object mode 40000 as directory Treat git object mode 40755 as directory Sep 17, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 17, 2022
@hollie
Copy link
Contributor

hollie commented Sep 17, 2022

Confirming this pull request fixes the issue #21190 on my setup!

@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 Sep 17, 2022
@codecov-commenter
Copy link

Codecov Report

Merging #21195 (763906f) into main (34f736c) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main   #21195   +/-   ##
=======================================
  Coverage   47.07%   47.07%           
=======================================
  Files        1016     1016           
  Lines      138049   138049           
=======================================
+ Hits        64982    64985    +3     
+ Misses      65124    65115    -9     
- Partials     7943     7949    +6
Impacted Files Coverage Δ
modules/git/parse_nogogit.go 55.44% <100.00%> (ø)
modules/git/repo_base_nogogit.go 71.69% <0.00%> (-3.78%) ⬇️
modules/git/utils.go 66.29% <0.00%> (-3.38%) ⬇️
modules/queue/queue_disk_channel.go 68.33% <0.00%> (-1.25%) ⬇️
modules/queue/workerpool.go 53.88% <0.00%> (-1.04%) ⬇️
models/issues/comment.go 49.78% <0.00%> (-0.66%) ⬇️
services/pull/pull.go 40.34% <0.00%> (-0.47%) ⬇️
modules/queue/queue_disk.go 63.33% <0.00%> (+3.33%) ⬆️
modules/queue/queue_bytefifo.go 53.06% <0.00%> (+5.77%) ⬆️
modules/indexer/stats/indexer.go 57.44% <0.00%> (+6.38%) ⬆️
... and 1 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@lunny lunny merged commit 3219641 into go-gitea:main Sep 18, 2022
@wxiaoguang wxiaoguang deleted the fix-tree-mode branch September 18, 2022 01:36
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 19, 2022
@zjjhot
Merge remote-tracking branch 'upstream/main'
15d11c1 
* upstream/main:
  Fix typo (go-gitea#21201)
  Remove unnecessary length check for repo's Description & Website (go-gitea#21194)
  Treat git object mode 40755 as directory (go-gitea#21195)
  Fix reaction of issues (go-gitea#21185)
  Fix CSV diff for added/deleted files (go-gitea#21189)
  Show label description in comments section (go-gitea#21156)
  Limit length of repo description and repo url input fields (go-gitea#21119)
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Sep 20, 2022
@wxiaoguang
Treat git object mode 40755 as directory (go-gitea#21195)
358a3f5 
Git uses 040000 for tree object, but some users may get 040755 for
unknown reasons

Try to fix go-gitea#21190
* go-gitea#21190
@wxiaoguang wxiaoguang mentioned this pull request Sep 20, 2022
Merged
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/v1.17 labels Sep 20, 2022
techknowlogick added a commit that referenced this pull request Sep 20, 2022
@wxiaoguang @techknowlogick
Treat git object mode 40755 as directory (#21195) (#21218)
937ef6f 
Backport #21195

Git uses 040000 for tree object, but some users may get 040755 for
unknown reasons, fix #21190

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.18.0
Development

Successfully merging this pull request may close these issues.

Error 500 when rendering web view of repository: unknown git object mode 40755
7 participants
@wxiaoguang @hollie @codecov-commenter @silverwind @lafriks @lunny @GiteaBot