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

Ensure that git daemon export ok is created for mirrors #17243

Merged
merged 14 commits into from
Oct 13, 2021
Merged

Ensure that git daemon export ok is created for mirrors #17243

merged 14 commits into from
Oct 13, 2021

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Oct 6, 2021

There is an issue with #16508 where it appears that create repo requires that the
repo does not exist. This causes #17241 where an error is reported because of this.

This PR fixes this and also runs update-server-info for mirrors and generated repos.

Fix #17241

Signed-off-by: Andrew Thornton art27@cantab.net

@zeripath
Ensure that git daemon export ok is created for mirrors
8f1e238 
There is an issue with go-gitea#16508 where it appears that create repo requires that the
repo does not exist. This causes go-gitea#17241 where an error is reported because of this.

This PR fixes this and also runs update-server-info for mirrors and generated repos.

Fix go-gitea#17241

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added this to the 1.16.0 milestone Oct 6, 2021
noerw
noerw reviewed Oct 8, 2021
View reviewed changes
Copy link
Member

@noerw noerw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, though the tests show a change in status codes from 201 to 200, though I can't see why the diff would make that happen.. 🤔

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 8, 2021
lafriks
lafriks reviewed Oct 8, 2021
View reviewed changes
models/repo.go Show resolved Hide resolved
@zeripath
as per lafriks
1443f8c 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
Merge remote-tracking branch 'origin/main' into fix-17241-daemon-expo…
807d110 
…rt-ok-only-when-repo-created
@zeripath
Copy link
Contributor Author

zeripath commented Oct 8, 2021 •
edited
Loading

LGTM, though the tests show a change in status codes from 201 to 200, though I can't see why the diff would make that happen.. thinking

Yeah I don't get how this could be related at all. I've been assuming it's a temporary issue but I'll see if it's still ongoing.

I think I've found the problem.

@zeripath
prevent panic
5aeb29f 
Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath
Merge remote-tracking branch 'origin/main' into fix-17241-daemon-expo…
3779738 
…rt-ok-only-when-repo-created
noerw
noerw reviewed Oct 9, 2021
View reviewed changes
modules/repository/repo.go Outdated Show resolved Hide resolved
@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 Oct 9, 2021
@zeripath zeripath force-pushed the fix-17241-daemon-export-ok-only-when-repo-created branch from 4e04363 to 3779738 Compare October 9, 2021 11:21
@codecov-commenter

This comment has been minimized.

Sign in to view
@GiteaBot GiteaBot added lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 9, 2021
@GiteaBot GiteaBot added lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Oct 10, 2021
@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 Oct 11, 2021
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 11, 2021
@zeripath
Copy link
Contributor Author

make lgtm work

@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 12, 2021
@6543
Copy link
Member

6543 commented Oct 12, 2021 •
edited
Loading

I realy do like how CheckDaemonExportOK(ctx context.Context) is implemented!

I think that's a nice idear to dynamicaly have one func who can be used within or outside a session (DB context)

@zeripath
Copy link
Contributor Author

zeripath commented Oct 12, 2021 •
edited
Loading

I realy do like how CheckDaemonExportOK(ctx context.Context) is implemented!

I think that's a nice idear to dynamicaly have one func who can be used within or outside a session (DB context)

Yes this is what I was trying to do with making the DB engine/session retrievable from the context.

Now there's slight fly in the ointment by doing this - we lose the strong typing of the session so one thing we can't do from our compiler is assert that you aren't trying to open a transaction from inside another transaction. However, this is a problem we already suffer from so things aren't made worse by this.

@zeripath zeripath merged commit 5a8dd96 into go-gitea:main Oct 13, 2021
@zeripath zeripath deleted the fix-17241-daemon-export-ok-only-when-repo-created branch October 13, 2021 19:47
zeripath added a commit to zeripath/gitea that referenced this pull request Oct 14, 2021
@zeripath
Ensure that git daemon export ok is created for mirrors (go-gitea#17243)
373c531 
Backport go-gitea#17243

There is an issue with go-gitea#16508 where it appears that create repo requires that the
repo does not exist. This causes go-gitea#17241 where an error is reported because of this.

This PR fixes this and also runs update-server-info for mirrors and generated repos.

Fix go-gitea#17241

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Oct 14, 2021
Merged
@zeripath zeripath added the backport/done All backports for this PR have been created label Oct 14, 2021
6543 pushed a commit that referenced this pull request Oct 14, 2021
@zeripath
Ensure that git daemon export ok is created for mirrors (#17243) (#17306
a20ccec 
)

Backport #17243

There is an issue with #16508 where it appears that create repo requires that the
repo does not exist. This causes #17241 where an error is reported because of this.

This PR fixes this and also runs update-server-info for mirrors and generated repos.

Fix #17241

Signed-off-by: Andrew Thornton <art27@cantab.net>
Chianina pushed a commit to Chianina/gitea that referenced this pull request Oct 15, 2021
@zeripath
Ensure that git daemon export ok is created for mirrors (go-gitea#17243)
e55d1df 
* Ensure that git daemon export ok is created for mirrors

There is an issue with go-gitea#16508 where it appears that create repo requires that the
repo does not exist. This causes go-gitea#17241 where an error is reported because of this.

This PR fixes this and also runs update-server-info for mirrors and generated repos.

Fix go-gitea#17241

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added a commit to zeripath/gitea that referenced this pull request Oct 21, 2021
@zeripath
Changelog 1.15.5
9ae77e1 
* SECURITY
  * Upgrade Bluemonday to v1.0.16 (go-gitea#17372) (go-gitea#17374)
  * Ensure correct SSH permissions check for private and restricted users (go-gitea#17370) (go-gitea#17373)
* BUGFIXES
  * Prevent NPE in CSV diff rendering when column removed (go-gitea#17018) (go-gitea#17377)
  * Offer rsa-sha2-512 and rsa-sha2-256 algorithms in internal SSH (go-gitea#17281) (go-gitea#17376)
  * Don't panic if we fail to parse U2FRegistration data (go-gitea#17304) (go-gitea#17371)
  * Ensure popup text is aligned left (backport for 1.15) (go-gitea#17343)
  * Ensure that git daemon export ok is created for mirrors (go-gitea#17243) (go-gitea#17306)
  * Disable core.protectNTFS (go-gitea#17300) (go-gitea#17302)
  * Use pointer for wrappedConn methods (go-gitea#17295) (go-gitea#17296)
  * AutoRegistration is supposed to be working with disabled registration (backport) (go-gitea#17292)
  * Handle duplicate keys on GPG key ring (go-gitea#17242) (go-gitea#17284)
  * Fix SVG side by side comparison link (go-gitea#17375) (go-gitea#17391)

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Oct 21, 2021
Merged
6543 pushed a commit that referenced this pull request Oct 21, 2021
@zeripath
Changelog 1.15.5 (#17392)
3aecea2 
* SECURITY
  * Upgrade Bluemonday to v1.0.16 (#17372) (#17374)
  * Ensure correct SSH permissions check for private and restricted users (#17370) (#17373)
* BUGFIXES
  * Prevent NPE in CSV diff rendering when column removed (#17018) (#17377)
  * Offer rsa-sha2-512 and rsa-sha2-256 algorithms in internal SSH (#17281) (#17376)
  * Don't panic if we fail to parse U2FRegistration data (#17304) (#17371)
  * Ensure popup text is aligned left (backport for 1.15) (#17343)
  * Ensure that git daemon export ok is created for mirrors (#17243) (#17306)
  * Disable core.protectNTFS (#17300) (#17302)
  * Use pointer for wrappedConn methods (#17295) (#17296)
  * AutoRegistration is supposed to be working with disabled registration (backport) (#17292)
  * Handle duplicate keys on GPG key ring (#17242) (#17284)
  * Fix SVG side by side comparison link (#17375) (#17391)

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath added a commit to zeripath/gitea that referenced this pull request Oct 22, 2021
@zeripath
Changelog 1.15.5 (go-gitea#17392)
e3365ce 
Frontport go-gitea#17392

* SECURITY
  * Upgrade Bluemonday to v1.0.16 (go-gitea#17372) (go-gitea#17374)
  * Ensure correct SSH permissions check for private and restricted users (go-gitea#17370) (go-gitea#17373)
* BUGFIXES
  * Prevent NPE in CSV diff rendering when column removed (go-gitea#17018) (go-gitea#17377)
  * Offer rsa-sha2-512 and rsa-sha2-256 algorithms in internal SSH (go-gitea#17281) (go-gitea#17376)
  * Don't panic if we fail to parse U2FRegistration data (go-gitea#17304) (go-gitea#17371)
  * Ensure popup text is aligned left (backport for 1.15) (go-gitea#17343)
  * Ensure that git daemon export ok is created for mirrors (go-gitea#17243) (go-gitea#17306)
  * Disable core.protectNTFS (go-gitea#17300) (go-gitea#17302)
  * Use pointer for wrappedConn methods (go-gitea#17295) (go-gitea#17296)
  * AutoRegistration is supposed to be working with disabled registration (backport) (go-gitea#17292)
  * Handle duplicate keys on GPG key ring (go-gitea#17242) (go-gitea#17284)
  * Fix SVG side by side comparison link (go-gitea#17375) (go-gitea#17391)

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Oct 22, 2021
Merged
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks left review comments

@noerw noerw noerw approved these changes

@6543 6543 6543 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.16.0
Development

Successfully merging this pull request may close these issues.

Mirror repo: no such file or directory <path>/git-daemon-export-ok
7 participants
@zeripath @codecov-commenter @6543 @lafriks @noerw @GiteaBot @techknowlogick