fix: correct git merge-base error code handling

2018-05-08 10:03:46 -07:00
parent 20245b733a
commit 4352144a98
2 changed files with 8 additions and 1 deletions
@@ -36,9 +36,15 @@ async function gitTags() {
 */
 async function isRefInHistory(ref) {
  try {
-    return (await execa('git', ['merge-base', '--is-ancestor', ref, 'HEAD'])).code === 0;
+    await execa('git', ['merge-base', '--is-ancestor', ref, 'HEAD']);
+    return true;
  } catch (err) {
+    if (err.code === 1) {
+      return false;
+    }
+
    debug(err);
+    throw err;
  }
 }