Skip to content
This repository has been archived by the owner on Aug 25, 2018. It is now read-only.

Syncing with gb vendor

Filippo Valsorda edited this page Jan 8, 2016 · 5 revisions

The file locations are different in gvt, so it's very hard to just cherry pick commits. Here's how to get a list of relevant commits and apply them.

Given the latest synced commit hash as $LATEST:

git lg $LATEST..origin/master -- vendor cmd/gb-vendor
git diff $LATEST origin/master -- vendor cmd/gb-vendor

The latest synced commit is 9e201fb

Once you have a commit you want to import:

(cd $GOPATH/src/github.com/constabulary/gb && git show $COMMIT -- vendor) | (cd gbvendor && patch -p2)
(cd $GOPATH/src/github.com/constabulary/gb && git show $COMMIT -- cmd/gb-vendor) | patch -p3

Finally commit with

git co -m "Import upstream changes up to constabulary/gb@$NEW_LATEST"
Clone this wiki locally