fix(import): Better handling of "Patch is empty" (#2588)

Using `git diff COMMIT^!` to check if patch is empty instead of English-only hard-coded string.
lerna · Nov 8, 2020 · 0497bc7 · 0497bc7
1 parent f6e7a13
commit 0497bc7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/commands/import/index.js b/commands/import/index.js
@@ -237,7 +237,9 @@ class ImportCommand extends Command {
           tracker.completeWork(1);
         })
         .catch(err => {
-          if (err.stdout.indexOf("Patch is empty.") === 0) {
+          // Getting commit diff to see if it's empty
+          const diff = this.externalExecSync("git", ["diff", "-s", `${sha}^!`]).trim();
+          if (diff === "") {
             tracker.completeWork(1);
 
             // Automatically skip empty commits