From 93b5ebffa638c500a95eab213efb896b4289f714 Mon Sep 17 00:00:00 2001
From: Alicia Lopez <alicia.lopez00318@gmail.com>
Date: Thu, 6 Aug 2020 10:25:18 -0700
Subject: [PATCH] fix: repo/path mismatch in v8 update (#465)

---
 lib/update-v8/constants.js   | 18 ++++++------------
 lib/update-v8/majorUpdate.js |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/lib/update-v8/constants.js b/lib/update-v8/constants.js
index 65d4675..be9bc07 100644
--- a/lib/update-v8/constants.js
+++ b/lib/update-v8/constants.js
@@ -34,8 +34,7 @@ const zlibIgnore = `!/third_party/zlib
 exports.v8Deps = [
   {
     name: 'trace_event',
-    repo: 'v8/base/trace_event/common',
-    path: 'base/trace_event/common',
+    repo: 'base/trace_event/common',
     gitignore: {
       match: '/base\n',
       replace: ''
@@ -44,8 +43,7 @@ exports.v8Deps = [
   },
   {
     name: 'gtest',
-    repo: 'v8/testing/gtest',
-    path: 'testing/gtest',
+    repo: 'testing/gtest',
     gitignore: {
       match: '/testing/gtest',
       replace: gtestReplace
@@ -55,22 +53,19 @@ exports.v8Deps = [
   },
   {
     name: 'jinja2',
-    repo: 'v8/third_party/jinja2',
-    path: 'third_party/jinja2',
+    repo: 'third_party/jinja2',
     gitignore: '!/third_party/jinja2',
     since: 56
   },
   {
     name: 'markupsafe',
-    repo: 'v8/third_party/markupsafe',
-    path: 'third_party/markupsafe',
+    repo: 'third_party/markupsafe',
     gitignore: '!/third_party/markupsafe',
     since: 56
   },
   {
     name: 'googletest',
-    repo: 'v8/third_party/googletest/src',
-    path: 'third_party/googletest/src',
+    repo: 'third_party/googletest/src',
     gitignore: {
       match: '/third_party/googletest/src',
       replace: googleTestReplace
@@ -79,8 +74,7 @@ exports.v8Deps = [
   },
   {
     name: 'zlib',
-    repo: 'v8/third_party/zlib',
-    path: 'third_party/zlib',
+    repo: 'third_party/zlib',
     gitignore: zlibIgnore,
     since: 80
   }
diff --git a/lib/update-v8/majorUpdate.js b/lib/update-v8/majorUpdate.js
index a838209..238779e 100644
--- a/lib/update-v8/majorUpdate.js
+++ b/lib/update-v8/majorUpdate.js
@@ -113,7 +113,7 @@ function updateV8Deps() {
           }
         }
         const [repo, commit] = await readDeps(ctx.nodeDir, dep.repo);
-        const thePath = path.join(ctx.nodeDir, 'deps/v8', dep.path);
+        const thePath = path.join(ctx.nodeDir, 'deps/v8', dep.repo);
         await fetchFromGit(thePath, repo, commit);
       }
       /* eslint-enable */