Remove unneeded and buggy stats check (#976)

SaurabViena · SaurabViena · commit f85159ad8fbf · 2047-03-16T07:02:00.000+08:00
As per nodejs/node#39372 (comment) Resolves jprichardson/node-fs-extra#918
diff --git a/lib/copy/copy-sync.js b/lib/copy/copy-sync.js
@@ -146,7 +146,7 @@ function onLink (destStat, src, dest, opts) {
     // prevent copy if src is a subdir of dest since unlinking
     // dest in this case would result in removing src contents
     // and therefore a broken symlink would be created.
-    if (fs.statSync(dest).isDirectory() && stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
+    if (stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
       throw new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`)
     }
     return copyLink(resolvedSrc, dest)
diff --git a/lib/copy/copy.js b/lib/copy/copy.js
@@ -219,7 +219,7 @@ function onLink (destStat, src, dest, opts, cb) {
         // do not copy if src is a subdir of dest since unlinking
         // dest in this case would result in removing src contents
         // and therefore a broken symlink would be created.
-        if (destStat.isDirectory() && stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
+        if (stat.isSrcSubdir(resolvedDest, resolvedSrc)) {
           return cb(new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`))
         }
         return copyLink(resolvedSrc, dest, cb)

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ function onLink (destStat, src, dest, opts) {`
`146`	`146`	`// prevent copy if src is a subdir of dest since unlinking`
`147`	`147`	`// dest in this case would result in removing src contents`
`148`	`148`	`// and therefore a broken symlink would be created.`
`149`		`- if (fs.statSync(dest).isDirectory() && stat.isSrcSubdir(resolvedDest, resolvedSrc)) {`
	`149`	`+ if (stat.isSrcSubdir(resolvedDest, resolvedSrc)) {`
`150`	`150`	throw new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`)
`151`	`151`	`}`
`152`	`152`	`return copyLink(resolvedSrc, dest)`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ function onLink (destStat, src, dest, opts, cb) {`
`219`	`219`	`// do not copy if src is a subdir of dest since unlinking`
`220`	`220`	`// dest in this case would result in removing src contents`
`221`	`221`	`// and therefore a broken symlink would be created.`
`222`		`- if (destStat.isDirectory() && stat.isSrcSubdir(resolvedDest, resolvedSrc)) {`
	`222`	`+ if (stat.isSrcSubdir(resolvedDest, resolvedSrc)) {`
`223`	`223`	return cb(new Error(`Cannot overwrite '${resolvedDest}' with '${resolvedSrc}'.`))
`224`	`224`	`}`
`225`	`225`	`return copyLink(resolvedSrc, dest, cb)`