Merge branch 'master' into recursive-ignore

CBike1103 · Oct 12, 2017 · 276ead9 · 276ead9
2 parents 4376248 + 07298e2
commit 276ead9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,15 +3,22 @@
 NEW FEATURES:
 
 * Wildcard ignore support. (#1156)
+* Disable SourceManager lock by setting `DEPNOLOCK` environment variable.
+(#1206)
 
 BUG FIXES:
 
+* gps: Fix case mismatch error with multiple dependers. (#1233)
 * Skip broken `vendor` symlink rather than returning an error. (#1191)
 * Fix `status` shows incorrect reason for lock mismatch when ignoring packages.
 (#1216)
 
 IMPROVEMENTS:
 
+* Allow `dep ensure -add` and `-update` when lock is out-of-sync. (#1225)
+* gps: vcs: Dedupe git version list (#1212)
+* gps: Add prune functions to gps. (#1020)
+* gps: Skip broken vendor symlinks. (#1191)
 * `dep ensure -add` now concurrently fetches the source and adds the projects.
 (#1218)
 * File name case check is now performed on `Gopkg.toml` and `Gopkg.lock`.
@@ -21,6 +28,13 @@ IMPROVEMENTS:
 Improving performance when updating dependencies with `-update`. (#1175)
 * `dep status` now concurrently fetches repo info. Improving status performance.
 (#1135)
+* gps: Add SourceURLsForPath() to SourceManager. (#1166)
+* gps: Include output in error. (#1180)
+
+WIP:
+
+* gps: Process canonical import paths. (#1017)
+* gps: Persistent cache. (#1127, #1215)
 
 
 # v0.3.1

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -30,9 +30,9 @@ Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html
 before sending patches.
 
 The
-[help-wanted](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3Ahelp-wanted)
+[help wanted](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3Ahelp wanted)
 label highlights issues that are well-suited for folks to jump in on. The
-[good-first-pr](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-pr)
+[good first issue](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3Agood first issue)
 label further identifies issues that are particularly well-sized for newcomers.
 
 Unless otherwise noted, the `dep` source files are distributed under
@@ -79,6 +79,7 @@ again.
 ### Issue management
 
 * We use [Zenhub](https://www.zenhub.com) to manage the queue, in addition to what we do with labels.
+  * You will need to install [ZenHub extension](https://www.zenhub.com/extension) to your browser to show the board.
   * Pipelines, and [the board](https://github.com/golang/dep#boards) are one thing we try to utilize:
     * **New Issues Pipeline**: When someone creates a new issue, it goes here first. Keep an eye out for issues that fall into your area. Add labels to them, and if it's something we should do, put it in the `Backlog` pipeline. If you aren't sure, throw it in the `Icebox`. It helps to sort this pipeline by date.
     * **Icebox Pipeline**: Issues that we aren't immediately closing but aren't really ready to be prioritized and started on. It's not a wontfix bucket, but a "not sure if we should/can fix right now" bucket.

diff --git a/hack/validate-gofmt.bash b/hack/validate-gofmt.bash
@@ -7,7 +7,7 @@
 # and is passing for certain directories in the project.
 #
 # Here we use `go list` to help determine which packages
-# we need to check for `go gmt`
+# we need to check for `go fmt`
 #
 # EXIT 0 - The check is successful
 # EXIT 1 - The check has failed
@@ -35,4 +35,4 @@ for PKG in $PKGS; do
         exit 1
     fi
 done;
-exit 0
+exit 0