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

Only use --exclude on name-rev with git >= 2.13 #12347

Merged
merged 2 commits into from
Jul 28, 2020

Conversation

zeripath
Copy link
Contributor

#11847 added the --exclude parameter to calls to git name-rev in git.Commit.GetBranchName(). Unfortunately it was missed that this parameter is not available in git < 2.13. This PR simply checks if the git version is >= 2.13 before adding this parameter.

Fix #11917

Signed-off-by: Andrew Thornton [email protected]

@zeripath zeripath added this to the 1.13.0 milestone Jul 28, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jul 28, 2020
@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 Jul 28, 2020
@zeripath
Copy link
Contributor Author

make lg-tm work

@zeripath zeripath merged commit 63e5bf6 into go-gitea:master Jul 28, 2020
@zeripath zeripath deleted the fix-11917 branch July 28, 2020 14:11
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
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.

git name-rev --exclude is not available in git <2.13 - breaking commit history
4 participants