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.

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

Import git from alpine 3.16 repository as 2.30.4 is needed for safe.directory = '*' to work but alpine 3.13 has 2.30.3 #19876

Merged

Conversation

singuliere
Copy link
Contributor

Refs: #19455

@singuliere singuliere added this to the 1.16.9 milestone Jun 2, 2022
@singuliere singuliere force-pushed the safe-directory-1-16 branch from 65e7ada to 35eb697 Compare June 2, 2022 22:05
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 3, 2022
@zeripath zeripath changed the title git 2.36 is needed for safe.directory = '*' to work Import git from alpine 3.16 repository as 2.36 is needed for safe.directory = '*' to work Jun 3, 2022
@zeripath zeripath changed the title Import git from alpine 3.16 repository as 2.36 is needed for safe.directory = '*' to work Import git from alpine 3.16 repository as 2.36 is needed for safe.directory = '*' to work Jun 3, 2022
@zeripath
Copy link
Contributor

zeripath commented Jun 3, 2022

I really think we need to make it clear that this is not needed if people set up their docker configurations correctly.

Gitea and Git requires that its repositories are owned by the user running Gitea, (usually git.) This configuration is ONLY needed if the configuration is not mapping ownership correctly.

@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 Jun 3, 2022
@wxiaoguang
Copy link
Contributor

Git 2.36 is not a must (and is not the first version) for the safe.directory. For example:

https://git-scm.com/docs/git-config/2.30.4#Documentation/git-config.txt-safedirectory
https://git-scm.com/docs/git-config/2.35.2#Documentation/git-config.txt-safedirectory

So, I can not understand why the 2.36 must be used as a backport.

@singuliere
Copy link
Contributor Author

Because the wildcard was introduced in 2.36:

https://git-scm.com/docs/git-config/2.36.1#Documentation/git-config.txt-safedirectory

See also this blog post for an extended analysis of the problem and the conditions for the workaround to be effective.

@wxiaoguang
Copy link
Contributor

image

@zeripath
Copy link
Contributor

zeripath commented Jun 3, 2022

I wonder if the problems people are experiencing may relate to a vendor provided versions of git which whilst badged 2.30.x may not actually match 2.30.x?

@singuliere
Copy link
Contributor Author

singuliere commented Jun 3, 2022

The wild card is documented in 2.30.4 but the git version provided with alpine-3.13 is 2.30.3 which is the base image for the Gitea docker files:

https://git-scm.com/docs/git-config/2.30.3#Documentation/git-config.txt-safedirectory

@wxiaoguang
Copy link
Contributor

The wild card is documented in 2.30.4 but the git version provided with alpine-3.13 is 2.30.3 which is the base image for the Gitea docker files:

https://git-scm.com/docs/git-config/2.30.3#Documentation/git-config.txt-safedirectory

That's clear and reasonable. (hopefully the git from alpine-3.16 is compatible with alpine-3.13)

@techknowlogick techknowlogick merged commit cf6694e into go-gitea:release/v1.16 Jun 3, 2022
@lunny lunny mentioned this pull request Jun 4, 2022
@lunny lunny changed the title Import git from alpine 3.16 repository as 2.36 is needed for safe.directory = '*' to work Import git from alpine 3.16 repository as 2.30.4 is needed for safe.directory = '*' to work but alpine 3.13 has 2.30.3 Jun 4, 2022
@lunny
Copy link
Member

lunny commented Jun 4, 2022

@singuliere I changed the title I think it's more accurate than before. If it's not, please change it directly.

zeripath added a commit to zeripath/gitea that referenced this pull request Jun 20, 2022
## [1.16.9](https://github.com/go-gitea/gitea/releases/tag/1.16.9) - 2022-06-20

* BUGFIXES
  * Fix permission check for delete tag (go-gitea#19985) (go-gitea#20001)
  * Only log non ErrNotExist errors in git.GetNote  (go-gitea#19884) (go-gitea#19905)
  *  Use exact search instead of fuzzy search for branch filter dropdown (go-gitea#19885) (go-gitea#19893)
  * Set Setpgid on child git processes (go-gitea#19865) (go-gitea#19881)
  * Import git from alpine 3.16 repository as 2.30.4 is needed for `safe.directory = '*'` to work but alpine 3.13 has 2.30.3 (go-gitea#19876)
  * Ensure responses are context.ResponseWriters (go-gitea#19843) (go-gitea#19859)
  * Fix count bug (go-gitea#19850)
  * Fix raw endpoint PDF file headers (go-gitea#19825) (go-gitea#19826)
  * Make WIP prefixes case insensitive, e.g. allow `Draft` as a WIP prefix (go-gitea#19780) (go-gitea#19811)
  * Fix NotificationUnreadCount (go-gitea#19802)
  * Prevent NPE when cache service is disabled (go-gitea#19703) (go-gitea#19783)
  * Detect truncated utf-8 characters at the end of content as still representing utf-8 (go-gitea#19773) (go-gitea#19774)
  * Fix doctor pq: syntax error at or near "." quote user table name (go-gitea#19765) (go-gitea#19770)
  * Fix bug (go-gitea#19757)

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath mentioned this pull request Jun 20, 2022
@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.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants