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 code.gitea.io/git #1824

Merged
merged 3 commits into from
May 30, 2017
Merged

Conversation

ethantkoenig
Copy link
Member

Bring in latest changes from https://github.com/go-gitea/git. Includes fix for #491 and #502 (see go-gitea/git#53)

@lunny lunny added this to the 1.2.0 milestone May 27, 2017
@lunny
Copy link
Member

lunny commented May 27, 2017

@ethantkoenig since some function params changed, you have to change the invoke places.

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

I'm confused as to why make test-vendor is failing in the CI; it passes when I run it locally

@sapk
Copy link
Member

sapk commented May 29, 2017

@ethantkoenig you fetch the commit of your PR that is not the same as the one in master + you edit file after.
Please, just do govendor fetch code.gitea.io/git (+commit changes) to have the last commit of master and all file in sync.

"path": "code.gitea.io/git",
"revision": "ed175468f8debc8cdb2fa495fc157f1b9d046628",
"revisionTime": "2017-05-04T06:58:26Z"
"revision": "ac69f9b0e2cde0dd064d6fa5055afd1fb2ec4d84",
Copy link
Member

@sapk sapk May 29, 2017

Choose a reason for hiding this comment

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

This is the commit id in PR go-gitea/git#55 in master it is : go-gitea/git@56f6a2c

@sapk
Copy link
Member

sapk commented May 29, 2017

Doing govendor fetch code.gitea.io/git I doesn't get the same hash. (don't know why ...)

[sapk@sapk-ultra gitea]$ govendor fetch code.gitea.io/git
[sapk@sapk-ultra gitea]$ git diff
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 60e47f03..2a910aef 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -3,7 +3,7 @@
        "ignore": "test appengine",
        "package": [
                {
-                       "checksumSHA1": "/QkpRq7qiUkZzBbLFMZ0FFZYIOQ=",
+                       "checksumSHA1": "iqK8QebzwEcNL2iIRpMAOYwb7Zg=",
                        "path": "code.gitea.io/git",
                        "revision": "c98a6f353a13546ae13e7391020cadd750181585",
                        "revisionTime": "2017-05-29T11:48:12Z"

@lunny
Copy link
Member

lunny commented May 30, 2017

LGTM

@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 May 30, 2017
@sapk
Copy link
Member

sapk commented May 30, 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 May 30, 2017
@appleboy appleboy merged commit 474d636 into go-gitea:master May 30, 2017
@ethantkoenig ethantkoenig deleted the update_vendor branch May 30, 2017 12:48
@lunny lunny added the type/bug label Aug 25, 2017
@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.

5 participants