Skip to content

Fix dump-repo git init, fix wrong error type for NullDownloader #20182

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Jun 30, 2022

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 30, 2022

Found a new dependency of git module.

The dump-repo sub-command should initialize the git module before calling git commands.

And NullDownloader returned wrong error type, which stops dump-repo command, it's fixed together.

ps: keeping the var git.DefaultContext = nil is by purpose, it will help to find all uninitialized calls to git module.

@codecov-commenter

This comment was marked as off-topic.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 30, 2022
@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 Jun 30, 2022
@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 30, 2022
@wxiaoguang wxiaoguang added backport/done All backports for this PR have been created backport/v1.17 skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Jun 30, 2022
@wxiaoguang wxiaoguang changed the title Fix dump-repo git init Fix dump-repo git init, fix wrong error type for NullDownloader Jun 30, 2022
@wxiaoguang
Copy link
Contributor Author

Sorry for bothering , but one more fix:

func IsErrNotSupported(err error) bool {
	_, ok := err.(ErrNotSupported)
...

// then in NullDownloader:
	return nil, &ErrNotSupported{}
}

The NullDownloader should return the struct instead of the pointer.

@lunny lunny merged commit d6c0aa7 into go-gitea:main Jun 30, 2022
@wxiaoguang wxiaoguang deleted the fix-dump-repo-git-init branch July 1, 2022 02:35
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jul 1, 2022
* upstream/main:
  Fix cli command restore-repo: "units" should be splitted to string slice, to match the old behavior and match the dump-repo's behavior (go-gitea#20183)
  [skip ci] Updated translations via Crowdin
  Fix `dump-repo` git init, fix wrong error type for NullDownloader (go-gitea#20182)
  Check if project has the same repository id with issue when assign project to issue (go-gitea#20133)
  [skip ci] Updated translations via Crowdin
6543 pushed a commit that referenced this pull request Jul 1, 2022
…0182) (#20186)

* Fix `dump-repo` git init

* Fix wrong error type for NullDownloader
vsysoev pushed a commit to IntegraSDL/gitea that referenced this pull request Aug 10, 2022
…-gitea#20182)

* Fix `dump-repo` git init

* fix wrong error type for NullDownloader
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
# for free to subscribe to this conversation on GitHub. Already have an account? #.
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. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants