fix: remove npm-merge-driver too

brandonocasey · Nov 9, 2020 · 7539ffb · 7539ffb
1 parent 0dac6aa
commit 7539ffb
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/uninstall.js b/src/uninstall.js
@@ -17,6 +17,12 @@ spawnSync(
   {cwd: rootDir}
 );
 
+spawnSync(
+  'git',
+  ['config', '--local', '--remove-section', 'merge.npm-merge-driver'],
+  {cwd: rootDir}
+);
+
 const attrFile = path.join(rootDir, '.git', 'info', 'attributes');
 
 // remove git attributes
@@ -25,11 +31,12 @@ if (fs.existsSync(attrFile)) {
 
   try {
     const RE = new RegExp('.* merge\\s*=\\s*npm-merge-driver-install$');
+    const RE2 = new RegExp('.* merge\\s*=\\s*npm-merge-driver$');
 
     attrContents = fs
       .readFileSync(attrFile, 'utf8')
       .split(/\r?\n/)
-      .filter(line => !line.match(RE))
+      .filter(line => !line.match(RE) && !line.match(RE2))
       .join('\n');
   } catch (e) {
     // some issue we cannot handle