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

Set GIT_DIR correctly if it is not set #15751

Merged
merged 3 commits into from
May 7, 2021

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented May 6, 2021

Fix #15744

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

Fix go-gitea#15744

Signed-off-by: Andrew Thornton <art27@cantab.net>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 6, 2021
Signed-off-by: Andrew Thornton <art27@cantab.net>
@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 May 6, 2021
@silverwind
Copy link
Member

silverwind commented May 6, 2021

Using https://github.com/lithammer/dedent would be even nicer 😉

@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 May 7, 2021
@6543
Copy link
Member

6543 commented May 7, 2021

I think the first commit was nice to see the diff itself, and how it is formatted now is totally fine.

to "dedent": I think we should not add to much boilerplate ...

@silverwind
Copy link
Member

Yes the diff is kind of destroyed with the reformatting. Dedent is optional but I still think worth it because code is much more often read than written and that's just more pleasureable if properly indented :)

@zeripath
Copy link
Contributor Author

zeripath commented May 7, 2021

to "dedent": I think we should not add to much boilerplate ...

A go-template or even destroy these hook files and make them unnecessary by using core.hooksPath cleverly.

@6543 6543 merged commit 8f0539c into go-gitea:main May 7, 2021
6543 pushed a commit to 6543-forks/gitea that referenced this pull request May 7, 2021
* Set GIT_DIR correctly if it is not set

* Expand out templates

Signed-off-by: Andrew Thornton <art27@cantab.net>
@6543 6543 added the backport/done All backports for this PR have been created label May 7, 2021
@6543
Copy link
Member

6543 commented May 7, 2021

-> #15769

6543 added a commit that referenced this pull request May 7, 2021
* Set GIT_DIR correctly if it is not set

* Expand out templates

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
@zeripath zeripath deleted the fix-15744-hook-template-fix branch May 7, 2021 18:17
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 10, 2021
* Set GIT_DIR correctly if it is not set

* Expand out templates

Signed-off-by: Andrew Thornton <art27@cantab.net>
@go-gitea go-gitea locked and limited conversation to collaborators Oct 19, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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
Development

Successfully merging this pull request may close these issues.

hook templates have incorrect directory calculation when GIT_DIR is not set
4 participants