npm-merge-driver-install
Advanced tools
Comparing version 2.0.0 to 2.0.1
@@ -0,1 +1,8 @@ | ||
<a name="2.0.1"></a> | ||
## [2.0.1](https://github.com/brandonocasey/npm-merge-driver-install/compare/v2.0.0...v2.0.1) (2020-11-09) | ||
### Bug Fixes | ||
* remove npm-merge-driver too ([7539ffb](https://github.com/brandonocasey/npm-merge-driver-install/commit/7539ffb)) | ||
<a name="2.0.0"></a> | ||
@@ -2,0 +9,0 @@ # [2.0.0](https://github.com/brandonocasey/npm-merge-driver-install/compare/v1.1.1...v2.0.0) (2020-10-22) |
{ | ||
"name": "npm-merge-driver-install", | ||
"version": "2.0.0", | ||
"version": "2.0.1", | ||
"description": "A package to install npm-merge-driver locally and automatically.", | ||
@@ -5,0 +5,0 @@ "repository": { |
@@ -20,2 +20,8 @@ #!/usr/bin/env node | ||
spawnSync( | ||
'git', | ||
['config', '--local', '--remove-section', 'merge.npm-merge-driver'], | ||
{cwd: rootDir} | ||
); | ||
const attrFile = path.join(rootDir, '.git', 'info', 'attributes'); | ||
@@ -29,2 +35,3 @@ | ||
const RE = new RegExp('.* merge\\s*=\\s*npm-merge-driver-install$'); | ||
const RE2 = new RegExp('.* merge\\s*=\\s*npm-merge-driver$'); | ||
@@ -34,3 +41,3 @@ attrContents = fs | ||
.split(/\r?\n/) | ||
.filter(line => !line.match(RE)) | ||
.filter(line => !line.match(RE) && !line.match(RE2)) | ||
.join('\n'); | ||
@@ -37,0 +44,0 @@ } catch (e) { |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
16407
262