Merge remote-tracking branch 'upstream/v0.12'merge-review

1 files changed, 3 insertions, 8 deletions

diff --git a/deps/npm/lib/repo.js b/deps/npm/lib/repo.js
index 3db4a16bc..1b0454773 100644
--- a/deps/npm/lib/repo.js
+++ b/deps/npm/lib/repo.js
@@ -15,14 +15,9 @@ var npm = require("./npm.js")
   , npa = require("npm-package-arg")
 
 repo.completion = function (opts, cb) {
-  if (opts.conf.argv.remain.length > 2) return cb()
-  mapToRegistry("/-/short", npm.config, function (er, uri) {
-    if (er) return cb(er)
-
-    npm.registry.get(uri, { timeout : 60000 }, function (er, list) {
-      return cb(null, list || [])
-    })
-  })
+  // FIXME: there used to be registry completion here, but it stopped making
+  // sense somewhere around 50,000 packages on the registry
+  cb()
 }
 
 function repo (args, cb) {