summaryrefslogtreecommitdiff
path: root/deps/npm/lib/utils/git.js
diff options
context:
space:
mode:
authorRebecca Turner <me@re-becca.org>2016-06-24 13:43:51 -0700
committerJeremiah Senkpiel <fishrock123@rocketmail.com>2016-06-27 11:46:15 +0200
commitd538811fc8b920f3f36d5f21a4c23e270367ceb0 (patch)
tree11cee6c00aa843f16a71819039396f80bf6abe22 /deps/npm/lib/utils/git.js
parent1db31a34948eee311abd9881bbf5d906d0cd678b (diff)
downloadandroid-node-v8-d538811fc8b920f3f36d5f21a4c23e270367ceb0.tar.gz
android-node-v8-d538811fc8b920f3f36d5f21a4c23e270367ceb0.tar.bz2
android-node-v8-d538811fc8b920f3f36d5f21a4c23e270367ceb0.zip
deps: upgrade npm to 3.10.2
Contains the following npm releases: - https://github.com/npm/npm/releases/tag/v3.9.6 - https://github.com/npm/npm/releases/tag/v3.10.0 - https://github.com/npm/npm/releases/tag/v3.10.1 - https://github.com/npm/npm/releases/tag/v3.10.2 PR-URL: https://github.com/nodejs/node/pull/7410 Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/lib/utils/git.js')
-rw-r--r--deps/npm/lib/utils/git.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/deps/npm/lib/utils/git.js b/deps/npm/lib/utils/git.js
index dc021300ea..4d05c75b86 100644
--- a/deps/npm/lib/utils/git.js
+++ b/deps/npm/lib/utils/git.js
@@ -11,6 +11,7 @@ var which = require('which')
var git = npm.config.get('git')
var assert = require('assert')
var log = require('npmlog')
+var noProgressTillDone = require('./no-progress-while-running.js').tillDone
function prefixGitArgs () {
return process.platform === 'win32' ? ['-c', 'core.longpaths=true'] : []
@@ -19,7 +20,7 @@ function prefixGitArgs () {
function execGit (args, options, cb) {
log.info('git', args)
var fullArgs = prefixGitArgs().concat(args || [])
- return exec(git, fullArgs, options, cb)
+ return exec(git, fullArgs, options, noProgressTillDone(cb))
}
function spawnGit (args, options) {