summaryrefslogtreecommitdiff
path: root/deps/npm/node_modules/glob/common.js
diff options
context:
space:
mode:
Diffstat (limited to 'deps/npm/node_modules/glob/common.js')
-rw-r--r--deps/npm/node_modules/glob/common.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/deps/npm/node_modules/glob/common.js b/deps/npm/node_modules/glob/common.js
index 78362b846b..66651bb3aa 100644
--- a/deps/npm/node_modules/glob/common.js
+++ b/deps/npm/node_modules/glob/common.js
@@ -103,7 +103,11 @@ function setopts (self, pattern, options) {
if (process.platform === "win32")
self.root = self.root.replace(/\\/g, "/")
- self.cwdAbs = makeAbs(self, self.cwd)
+ // TODO: is an absolute `cwd` supposed to be resolved against `root`?
+ // e.g. { cwd: '/test', root: __dirname } === path.join(__dirname, '/test')
+ self.cwdAbs = isAbsolute(self.cwd) ? self.cwd : makeAbs(self, self.cwd)
+ if (process.platform === "win32")
+ self.cwdAbs = self.cwdAbs.replace(/\\/g, "/")
self.nomount = !!options.nomount
// disable comments and negation in Minimatch.