hack/vendor.sh: overwrite existing dependencies and remove .git so they can be checked in

Solomon Hykes · Solomon Hykes · commit 45cedefadb44 · 2013-09-11T18:38:09.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -14,5 +14,6 @@ docs/_templates
 .gopath/
 .dotcloud
 *.test
-vendor/
 bundles/
+.hg/
+.git/
diff --git a/hack/vendor.sh b/hack/vendor.sh
@@ -12,10 +12,12 @@ git_clone () {
   (
     set -e
     cd $vendor_dir
-    if [[ ! -d src/$PKG ]]; then
-      cd $vendor_dir && git clone http://$PKG src/$PKG
+    if [[ -d src/$PKG ]]; then
+      echo "src/$PKG already exists. Removing."
+      rm -fr src/$PKG
     fi
-    cd src/$PKG && git checkout -f $REV
+    cd $vendor_dir && git clone http://$PKG src/$PKG
+    cd src/$PKG && git checkout -f $REV && rm -fr .git
   )
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,12 @@ git_clone () {`
`12`	`12`	`(`
`13`	`13`	`set -e`
`14`	`14`	`cd $vendor_dir`
`15`		`- if [[ ! -d src/$PKG ]]; then`
`16`		`- cd $vendor_dir && git clone http://$PKG src/$PKG`
	`15`	`+ if [[ -d src/$PKG ]]; then`
	`16`	`+ echo "src/$PKG already exists. Removing."`
	`17`	`+ rm -fr src/$PKG`
`17`	`18`	`fi`
`18`		`- cd src/$PKG && git checkout -f $REV`
	`19`	`+ cd $vendor_dir && git clone http://$PKG src/$PKG`
	`20`	`+ cd src/$PKG && git checkout -f $REV && rm -fr .git`
`19`	`21`	`)`
`20`	`22`	`}`
`21`	`23`