Skip to content

Instantly share code, notes, and snippets.

@tianon
Last active August 29, 2015 14:14
Show Gist options
  • Save tianon/43e555654124b2b7c240 to your computer and use it in GitHub Desktop.
Save tianon/43e555654124b2b7c240 to your computer and use it in GitHub Desktop.
vendor.sh changes from 1.3.3 to master
diff --git a/hack/vendor.sh b/project/vendor.sh
similarity index 87%
rename from hack/vendor.sh
rename to project/vendor.sh
index 7ecb1a5..b60e42f 100755
--- a/hack/vendor.sh
+++ b/project/vendor.sh
@@ -39,7 +39,7 @@ clone() {
echo done
}
-clone git github.com/kr/pty 67e2db24c8
+clone git github.com/kr/pty 05017fcccf
clone git github.com/gorilla/context 14f550f51a
@@ -51,7 +51,11 @@ clone hg code.google.com/p/go.net 84a4013f96e0
clone hg code.google.com/p/gosqlite 74691fb6f837
-clone git github.com/docker/libtrust d273ef2565ca
+clone git github.com/docker/libtrust 230dfd18c232
+
+clone git github.com/Sirupsen/logrus v0.6.0
+
+clone git github.com/go-fsnotify/fsnotify v1.0.4
# get Go tip's archive/tar, for xattr support and improved performance
# TODO after Go 1.4 drops, bump our minimum supported version and drop this vendored dep
@@ -64,7 +68,7 @@ if [ "$1" = '--go' ]; then
mv tmp-tar src/code.google.com/p/go/src/pkg/archive/tar
fi
-clone git github.com/docker/libcontainer 8d1d0ba38a7348c5cfdc05aea3be34d75aadc8de
+clone git github.com/docker/libcontainer eb74393a3d2daeafbef4f5f27c0821cbdd67559c
# see src/github.com/docker/libcontainer/update-vendor.sh which is the "source of truth" for libcontainer deps (just like this file)
rm -rf src/github.com/docker/libcontainer/vendor
eval "$(grep '^clone ' src/github.com/docker/libcontainer/update-vendor.sh | grep -v 'github.com/codegangsta/cli')"
git diff -C -C -C v1.3.3...v1.4.1 -- project/vendor.sh hack/vendor.sh vendor/src/github.com/docker/libcontainer/update-vendor.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment