Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork6.3k
Fix archive creating LFS hooks and breaking pull requests#28848
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
When LFS hooks are present in gitea-repositories, operations like gitpush for creating a pull request fail. These repositories are not meantto include LFS files or git push them, that is handled separately. Andso they should not have LFS hooks.Installing git-lfs on some systems (like Debian Linux) will automaticallyset up /etc/gitconfig to create LFS hooks in repositories. For most gitcommands in Gitea this is not a problem, either because they run on atemporary clone or the git command does not create LFS hooks.But one case where this happens is git archive for creating repositoryarchives. To fix that, add a GIT_CONFIG_NOSYSTEM=1 to disable using thesystem configuration for that command.According to a comment, GIT_CONFIG_NOSYSTEM is not used for all gitcommands because the system configuration can be intentionally set upfor Gitea to use.Resolvesgo-gitea#19810,go-gitea#21148
ContributorAuthor
brechtvl commentedJan 19, 2024
This is the case that we at Blender and others have run into, but it's difficult to check that it's really the only git command that suffers from this. More reliable would be to set |
wxiaoguang approved these changesJan 19, 2024
Contributor
wxiaoguang commentedJan 19, 2024
Quite interesting ... maybe that's why some people could reproduce while some others couldn't. I guess Gitea should ideally ignore the system git config for all git commands, indeed Gitea is using its private/internal git config since#20114 and#19732 , I think there is no reason to make Gitea use unmanaged git config anymore. |
lunny approved these changesJan 19, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull requestJan 19, 2024
…8848)When LFS hooks are present in gitea-repositories, operations like gitpush for creating a pull request fail. These repositories are not meantto include LFS files or git push them, that is handled separately. Andso they should not have LFS hooks.Installing git-lfs on some systems (like Debian Linux) willautomatically set up /etc/gitconfig to create LFS hooks in repositories.For most git commands in Gitea this is not a problem, either becausethey run on a temporary clone or the git command does not create LFShooks.But one case where this happens is git archive for creating repositoryarchives. To fix that, add a GIT_CONFIG_NOSYSTEM=1 to disable using thesystem configuration for that command.According to a comment, GIT_CONFIG_NOSYSTEM is not used for all gitcommands because the system configuration can be intentionally set upfor Gitea to use.Resolvesgo-gitea#19810,go-gitea#21148
KN4CK3R pushed a commit that referenced this pull requestJan 21, 2024
…28851)Backport#28848 by@brechtvlWhen LFS hooks are present in gitea-repositories, operations like gitpush for creating a pull request fail. These repositories are not meantto include LFS files or git push them, that is handled separately. Andso they should not have LFS hooks.Installing git-lfs on some systems (like Debian Linux) willautomatically set up /etc/gitconfig to create LFS hooks in repositories.For most git commands in Gitea this is not a problem, either becausethey run on a temporary clone or the git command does not create LFShooks.But one case where this happens is git archive for creating repositoryarchives. To fix that, add a GIT_CONFIG_NOSYSTEM=1 to disable using thesystem configuration for that command.According to a comment, GIT_CONFIG_NOSYSTEM is not used for all gitcommands because the system configuration can be intentionally set upfor Gitea to use.Resolves#19810,#21148Co-authored-by: Brecht Van Lommel <brecht@blender.org>
zjjhot added a commit to zjjhot/gitea that referenced this pull requestJan 22, 2024
* giteaofficial/main: [skip ci] Updated licenses and gitignores Prevent anonymous container access if `RequireSignInView` is enabled (go-gitea#28877) Don't show new pr button when page is not compare pull (go-gitea#26431) Avoid duplicate JS error messages on UI (go-gitea#28873) Fix branch list bug which displayed default branch twice (go-gitea#28878) Revert adding htmx until we finaly decide to add it (go-gitea#28879) Don't do a full page load when clicking the follow button (go-gitea#28872) Don't do a full page load when clicking the subscribe button (go-gitea#28871) Fix incorrect PostgreSQL connection string for Unix sockets (go-gitea#28865) Run `npm audit fix` (go-gitea#28866) Fix migrate storage bug (go-gitea#28830) Set the `isPermaLink` attribute to `false` in the `guid` sub-element (go-gitea#28860) In administration documentation about environment variables, point to those for the Go runtime instead of Go compiler (go-gitea#28859) Move doctor package from modules to services (go-gitea#28856) Add support for sha256 repositories (go-gitea#23894) Fix incorrect action duration time when rerun the job before executed once (go-gitea#28364) Fix some RPM registry flaws (go-gitea#28782) tests: missing refs/ in bare repositories (go-gitea#28844) Fix archive creating LFS hooks and breaking pull requests (go-gitea#28848)
henrygoodman pushed a commit to henrygoodman/gitea that referenced this pull requestJan 31, 2024
…8848)When LFS hooks are present in gitea-repositories, operations like gitpush for creating a pull request fail. These repositories are not meantto include LFS files or git push them, that is handled separately. Andso they should not have LFS hooks.Installing git-lfs on some systems (like Debian Linux) willautomatically set up /etc/gitconfig to create LFS hooks in repositories.For most git commands in Gitea this is not a problem, either becausethey run on a temporary clone or the git command does not create LFShooks.But one case where this happens is git archive for creating repositoryarchives. To fix that, add a GIT_CONFIG_NOSYSTEM=1 to disable using thesystem configuration for that command.According to a comment, GIT_CONFIG_NOSYSTEM is not used for all gitcommands because the system configuration can be intentionally set upfor Gitea to use.Resolvesgo-gitea#19810,go-gitea#21148
nrdufour added a commit to nrdufour/home-ops that referenced this pull requestFeb 4, 2024
This PR contains the following updates:| Package | Update | Change ||---|---|---|| [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.21.4` -> `1.21.5` |---### Release Notes<details><summary>go-gitea/gitea (docker.io/gitea/gitea)</summary>### [`v1.21.5`](https://github.com/go-gitea/gitea/releases/tag/v1.21.5)[Compare Source](go-gitea/gitea@v1.21.4...v1.21.5)- SECURITY - Prevent anonymous container access if `RequireSignInView` is enabled ([#​28877](go-gitea/gitea#28877)) ([#​28882](go-gitea/gitea#28882)) - Update go dependencies and fix go-git ([#​28893](go-gitea/gitea#28893)) ([#​28934](go-gitea/gitea#28934))- BUGFIXES - Revert "Speed up loading the dashboard on mysql/mariadb ([#​28546](go-gitea/gitea#28546))" ([#​29006](go-gitea/gitea#29006)) ([#​29007](go-gitea/gitea#29007)) - Fix an actions schedule bug ([#​28942](go-gitea/gitea#28942)) ([#​28999](go-gitea/gitea#28999)) - Fix update enable_prune even if mirror_interval is not provided ([#​28905](go-gitea/gitea#28905)) ([#​28929](go-gitea/gitea#28929)) - Fix uploaded artifacts should be overwritten ([#​28726](go-gitea/gitea#28726)) backport v1.21 ([#​28832](go-gitea/gitea#28832)) - Preserve BOM in web editor ([#​28935](go-gitea/gitea#28935)) ([#​28959](go-gitea/gitea#28959)) - Strip `/` from relative links ([#​28932](go-gitea/gitea#28932)) ([#​28952](go-gitea/gitea#28952)) - Don't remove all mirror repository's releases when mirroring ([#​28817](go-gitea/gitea#28817)) ([#​28939](go-gitea/gitea#28939)) - Implement `MigrateRepository` for the actions notifier ([#​28920](go-gitea/gitea#28920)) ([#​28923](go-gitea/gitea#28923)) - Respect branch info for relative links ([#​28909](go-gitea/gitea#28909)) ([#​28922](go-gitea/gitea#28922)) - Don't reload timeline page when (un)resolving or replying conversation ([#​28654](go-gitea/gitea#28654)) ([#​28917](go-gitea/gitea#28917)) - Only migrate the first 255 chars of a Github issue title ([#​28902](go-gitea/gitea#28902)) ([#​28912](go-gitea/gitea#28912)) - Fix sort bug on repository issues list ([#​28897](go-gitea/gitea#28897)) ([#​28901](go-gitea/gitea#28901)) - Fix `DeleteCollaboration` transaction behaviour ([#​28886](go-gitea/gitea#28886)) ([#​28889](go-gitea/gitea#28889)) - Fix schedule not trigger bug because matching full ref name with short ref name ([#​28874](go-gitea/gitea#28874)) ([#​28888](go-gitea/gitea#28888)) - Fix migrate storage bug ([#​28830](go-gitea/gitea#28830)) ([#​28867](go-gitea/gitea#28867)) - Fix archive creating LFS hooks and breaking pull requests ([#​28848](go-gitea/gitea#28848)) ([#​28851](go-gitea/gitea#28851)) - Fix reverting a merge commit failing ([#​28794](go-gitea/gitea#28794)) ([#​28825](go-gitea/gitea#28825)) - Upgrade xorm to v1.3.7 to fix a resource leak problem caused by Iterate ([#​28891](go-gitea/gitea#28891)) ([#​28895](go-gitea/gitea#28895)) - Fix incorrect PostgreSQL connection string for Unix sockets ([#​28865](go-gitea/gitea#28865)) ([#​28870](go-gitea/gitea#28870))- ENHANCEMENTS - Make loading animation less aggressive ([#​28955](go-gitea/gitea#28955)) ([#​28956](go-gitea/gitea#28956)) - Avoid duplicate JS error messages on UI ([#​28873](go-gitea/gitea#28873)) ([#​28881](go-gitea/gitea#28881)) - Bump `@github/relative-time-element` to 4.3.1 ([#​28819](go-gitea/gitea#28819)) ([#​28826](go-gitea/gitea#28826))- MISC - Warn that `DISABLE_QUERY_AUTH_TOKEN` is false only if it's explicitly defined ([#​28783](go-gitea/gitea#28783)) ([#​28868](go-gitea/gitea#28868)) - Remove duplicated checkinit on git module ([#​28824](go-gitea/gitea#28824)) ([#​28831](go-gitea/gitea#28831))Instances on **[Gitea Cloud](https://cloud.gitea.com)** will be automatically upgraded to this version during the specified maintenance window.</details>---### Configuration📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.🔕 **Ignore**: Close this PR and you won't be reminded about this update again.--- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box---This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNjUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE2NS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->Reviewed-on:https://git.home/nrdufour/home-ops/pulls/355Co-authored-by: Renovate <renovate@ptinem.io>Co-committed-by: Renovate <renovate@ptinem.io>
silverwind pushed a commit to silverwind/gitea that referenced this pull requestFeb 20, 2024
…8848)When LFS hooks are present in gitea-repositories, operations like gitpush for creating a pull request fail. These repositories are not meantto include LFS files or git push them, that is handled separately. Andso they should not have LFS hooks.Installing git-lfs on some systems (like Debian Linux) willautomatically set up /etc/gitconfig to create LFS hooks in repositories.For most git commands in Gitea this is not a problem, either becausethey run on a temporary clone or the git command does not create LFShooks.But one case where this happens is git archive for creating repositoryarchives. To fix that, add a GIT_CONFIG_NOSYSTEM=1 to disable using thesystem configuration for that command.According to a comment, GIT_CONFIG_NOSYSTEM is not used for all gitcommands because the system configuration can be intentionally set upfor Gitea to use.Resolvesgo-gitea#19810,go-gitea#21148
Sign up for freeto subscribe to this conversation on GitHub. Already have an account?Sign in.
Labels
backport/doneAll backports for this PR have been created lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When LFS hooks are present in gitea-repositories, operations like git push for creating a pull request fail. These repositories are not meant to include LFS files or git push them, that is handled separately. And so they should not have LFS hooks.
Installing git-lfs on some systems (like Debian Linux) will automatically set up /etc/gitconfig to create LFS hooks in repositories. For most git commands in Gitea this is not a problem, either because they run on a temporary clone or the git command does not create LFS hooks.
But one case where this happens is git archive for creating repository archives. To fix that, add a GIT_CONFIG_NOSYSTEM=1 to disable using the system configuration for that command.
According to a comment, GIT_CONFIG_NOSYSTEM is not used for all git commands because the system configuration can be intentionally set up for Gitea to use.
Resolves#19810,#21148