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

update git and fix #1133 #1614

Merged
merged 2 commits into from
Apr 28, 2017
Merged

Conversation

lunny
Copy link
Member

@lunny lunny commented Apr 26, 2017

will fix #1133

@lunny lunny added the type/bug label Apr 26, 2017
@lunny lunny added this to the 1.2.0 milestone Apr 26, 2017
@sapk
Copy link
Member

sapk commented Apr 26, 2017

LGTM and drone will check if vendoring is good ^^

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 26, 2017
@lunny
Copy link
Member Author

lunny commented Apr 26, 2017

@sapk, I think maybe the check has some wrong. The vendor package could be older than the original package. It's not an error.

@tboerger tboerger 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 Apr 26, 2017
@lunny
Copy link
Member Author

lunny commented Apr 26, 2017

And I have run govendor status +outside +unused on my branch, it shows

The following packages are missing or modified locally:
       	github.com/go-xorm/core
       	github.com/go-xorm/xorm

But the drone said code.gitea.io/git is missing or modified locally. So I think maybe the vendor-test has something wrong.

@sapk
Copy link
Member

sapk commented Apr 26, 2017

File command_test.go is missing go-gitea/git@135704d...go-gitea:3f99247c0da807afc967c7e12b14f4109b7490ff to be compliant with commit 3f99247

What did you used to update vendor ?

@sapk
Copy link
Member

sapk commented Apr 26, 2017

Can you try to do a govendor sync ? It should add file command_test.go and do a git add to commit it.

@lunny
Copy link
Member Author

lunny commented Apr 27, 2017

I used govendor update. I will update this.

@lunny
Copy link
Member Author

lunny commented Apr 27, 2017

It seems govendor sync also do not copy test files?

@sapk
Copy link
Member

sapk commented Apr 27, 2017

Oh it seems that https://github.com/go-gitea/gitea/blob/master/vendor/vendor.json#L3 is maybe blocking test_file ...

But it shouldn't affect the command govendor status +outside +unused that should use the same config. I will have a look at it.

@sapk
Copy link
Member

sapk commented Apr 27, 2017

In fact there is no test_file in vendor so if this work in other dependencies this should also work here. I am searching why. https://github.com/search?utf8=%E2%9C%93&q=repo%3Ago-gitea%2Fgitea+language%3AGo+path%3Avendor+test&type=Code

@sapk
Copy link
Member

sapk commented Apr 27, 2017

I haven't try but https://github.com/kardianos/govendor/wiki/Govendor-CheatSheet#important-detail. I will test with fetch when I have access to a cli.

@sapk
Copy link
Member

sapk commented Apr 27, 2017

Ok I have tested and it seems that if you fetch it doesn't give the same checksumSHA1.

@sapk
Copy link
Member

sapk commented Apr 27, 2017

@lunny please do govendor fetch code.gitea.io/git and commit vendor/vendor.json

@sapk
Copy link
Member

sapk commented Apr 27, 2017

You should have a checksum starting with spqE5x...

@lunny
Copy link
Member Author

lunny commented Apr 27, 2017

@sapk done.

@sapk
Copy link
Member

sapk commented Apr 27, 2017

Perfect, I hope it will pass now ^^

@bkcsoft
Copy link
Member

bkcsoft commented Apr 28, 2017

LGTM

@tboerger tboerger 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 Apr 28, 2017
@bkcsoft bkcsoft merged commit 91d6465 into go-gitea:master Apr 28, 2017
@lunny lunny deleted the lunny/fix_release_show branch April 28, 2017 14:21
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 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.

Releases page don't show anything if git version less than 1.8
4 participants