fix: git-clang-format doesn't recognize no changes requested on given…

… files (#835)
nodejs · Nov 20, 2020 · 59c6a6a · 59c6a6a
1 parent 1427b3e
commit 59c6a6a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -303,7 +303,7 @@
     "predev:incremental": "node-gyp configure build -C test --debug",
     "dev:incremental": "node test",
     "doc": "doxygen doc/Doxyfile",
-    "lint": "node scripts/clang-format.js",
+    "lint": "node tools/clang-format.js",
     "lint:fix": "git-clang-format"
   },
   "pre-commit": "lint",

diff --git a/tools/README.md b/tools/README.md
@@ -1,4 +1,10 @@
-# Migration Script
+# Tools
+
+## clang-format
+
+The clang-format checking tools is designed to check changed lines of code compared to given git-refs.
+
+## Migration Script
 
 The migration tool is designed to reduce repetitive work in the migration process. However, the script is not aiming to convert every thing for you. There are usually some small fixes and major reconstruction required.
 

diff --git a/scripts/clang-format.js → tools/clang-format.js b/scripts/clang-format.js → tools/clang-format.js
@@ -27,7 +27,8 @@ function main(args) {
   }
 
   const clangFormatOutput = result.stdout.trim();
-  if (clangFormatOutput !== ('no modified files to format') &&
+  if (clangFormatOutput !== '' &&
+      clangFormatOutput !== ('no modified files to format') &&
       clangFormatOutput !== ('clang-format did not modify any files')) {
     console.error(clangFormatOutput);
     const fixCmd = '"npm run lint:fix"';