From c4d6d0cb7b7377e15da91230a8c9af6e7774669f Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Thu, 15 Oct 2020 14:49:31 +0800
Subject: [PATCH 1/3] Add `.git-blame-ignore-revs`

---
 .git-blame-ignore-revs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000000..cff725515822
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,30 @@
+# git-blame ignored revisions
+# To configure, run
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+# Requires Git > 2.23
+# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
+
+# Prettier bump to 2.1.2
+c4d3014b95122f4ad19c319a9b3f5f9625d6003f
+# Prettier bump to 2.1.1
+a8363197118e530d948978da6e5c414a765ba9c0
+# Prettier bump to 2.1.0
+cef4bcafc7867050582d3107632bde7e722575d1
+# Prettier bump to 2.0.5
+d33f8a3e2c0a59cb9f383ddec5bbf8d296bb1a23
+# Prettier bump to 2.0.4
+592149791e4fea656d8c5fa34c25d4d19076a07a
+# Prettier bump to 2.0.3
+64b3ac9e8e933a09f049b7cace540ee526f4d5a4
+# Prettier bump to 2.0.2
+c1dd17cf383b78fd8fd43442bb5db59b51900410
+# Prettier bump to 2.0.1
+f56d620be529b60c13032681446c1eb76e0fb088
+# Prettier bump to 2.0.0
+9dad95b35f935edce4c3d6cfa45c79a0b9c82b9f
+
+# Categorize tests (#8239 #8248 #8249 #8251)
+b585bd6fa4d750a98e277303c428edfc48fea3f4
+f8c5b1fd1da4d67bc09d12bc3411b70d0fa4f4a1
+b6225788966a4a6b49e652044337436642dcd627
+7ad515111e79a3f304d5480d6586314222052333

From 5bda0c9c163d6f0fdf8803787b4321012be58ebd Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Fri, 16 Oct 2020 10:27:47 +0800
Subject: [PATCH 2/3] Add script to ignore Prettier bump commit

---
 .git-blame-ignore-revs                 | 19 ++++++++++---------
 scripts/release/steps/bump-prettier.js | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index cff725515822..6dba275511ec 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -4,23 +4,24 @@
 # Requires Git > 2.23
 # See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
 
-# Prettier bump to 2.1.2
+# Prettier bump after release
+# 2.1.2
 c4d3014b95122f4ad19c319a9b3f5f9625d6003f
-# Prettier bump to 2.1.1
+# 2.1.1
 a8363197118e530d948978da6e5c414a765ba9c0
-# Prettier bump to 2.1.0
+# 2.1.0
 cef4bcafc7867050582d3107632bde7e722575d1
-# Prettier bump to 2.0.5
+# 2.0.5
 d33f8a3e2c0a59cb9f383ddec5bbf8d296bb1a23
-# Prettier bump to 2.0.4
+# 2.0.4
 592149791e4fea656d8c5fa34c25d4d19076a07a
-# Prettier bump to 2.0.3
+# 2.0.3
 64b3ac9e8e933a09f049b7cace540ee526f4d5a4
-# Prettier bump to 2.0.2
+# 2.0.2
 c1dd17cf383b78fd8fd43442bb5db59b51900410
-# Prettier bump to 2.0.1
+# 2.0.1
 f56d620be529b60c13032681446c1eb76e0fb088
-# Prettier bump to 2.0.0
+# 2.0.0
 9dad95b35f935edce4c3d6cfa45c79a0b9c82b9f
 
 # Categorize tests (#8239 #8248 #8249 #8251)
diff --git a/scripts/release/steps/bump-prettier.js b/scripts/release/steps/bump-prettier.js
index 679e57149015..42aa82abae71 100644
--- a/scripts/release/steps/bump-prettier.js
+++ b/scripts/release/steps/bump-prettier.js
@@ -1,5 +1,6 @@
 "use strict";
 
+const fs = require("fs");
 const execa = require("execa");
 const semver = require("semver");
 const { logPromise, readJson, writeJson } = require("../utils");
@@ -15,6 +16,20 @@ async function commit(version) {
     "-am",
     `Bump Prettier dependency to ${version}`,
   ]);
+
+  // Add rev to `.git-blame-ignore-revs` file
+  const file = ".git-blame-ignore-revs";
+  const mark = "# Prettier bump after release";
+  const rev = await execa.stdout("git", ["rev-parse", "HEAD"]);
+  let text = fs.readFileSync(file, "utf8");
+  text = text.replace(mark, `${mark}\n# ${version}\n${rev}`);
+  fs.writeFileSync(file, text);
+  await execa("git", [
+    "commit",
+    "-am",
+    `Git blame ignore ${version}`,
+  ]);
+
   await execa("git", ["push"]);
 }
 

From e44bc9d1f9c2fdc00e0acf47823e3fd3701b6226 Mon Sep 17 00:00:00 2001
From: fisker <lionkay@gmail.com>
Date: Fri, 16 Oct 2020 10:31:32 +0800
Subject: [PATCH 3/3] Style

---
 scripts/release/steps/bump-prettier.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/release/steps/bump-prettier.js b/scripts/release/steps/bump-prettier.js
index 42aa82abae71..c965586abeca 100644
--- a/scripts/release/steps/bump-prettier.js
+++ b/scripts/release/steps/bump-prettier.js
@@ -24,11 +24,7 @@ async function commit(version) {
   let text = fs.readFileSync(file, "utf8");
   text = text.replace(mark, `${mark}\n# ${version}\n${rev}`);
   fs.writeFileSync(file, text);
-  await execa("git", [
-    "commit",
-    "-am",
-    `Git blame ignore ${version}`,
-  ]);
+  await execa("git", ["commit", "-am", `Git blame ignore ${version}`]);
 
   await execa("git", ["push"]);
 }