Merge pull request #1921 from jonstacks/godeps

Don't exclude Godeps folder. Fixes #1822
golang · Jul 4, 2018 · 1208520 · 1208520
2 parents a437df4 + 85c2647
commit 1208520
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ IMPROVEMENTS:
 * Add template operations support in dep status template output ([#1549](https://github.com/golang/dep/pull/1549)).
 * Reduce network access by trusting local source information and only pulling from upstream when necessary ([#1250](https://github.com/golang/dep/pull/1250)).
 * Update our dependency on Masterminds/semver to follow upstream again now that [Masterminds/semver#67](https://github.com/Masterminds/semver/pull/67) is merged([#1792](https://github.com/golang/dep/pull/1792)).
+* Don't exclude `Godeps` folder ([#1822](https://github.com/golang/dep/issues/1822)).
 
 WIP:
 * Enable importing external configuration from dependencies during init (#1277). This is feature flagged and disabled by default.

diff --git a/gps/pkgtree/pkgtree.go b/gps/pkgtree/pkgtree.go
@@ -89,7 +89,7 @@ func ListPackages(fileRoot, importRoot string) (PackageTree, error) {
 		// We don't skip _*, or testdata dirs because, while it may be poor
 		// form, importing them is not a compilation error.
 		switch fi.Name() {
-		case "vendor", "Godeps":
+		case "vendor":
 			return filepath.SkipDir
 		}