refactor: rule commit-name

MailOnline · Nov 10, 2017 · 082855d · 082855d
1 parent f7c721d
commit 082855d
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lib/rules/commit-name.js b/lib/rules/commit-name.js
@@ -80,15 +80,16 @@ module.exports = {
     };
 
     function users(cmt) {
-      const author = user(cmt, 'author');
-      const committer = user(cmt, 'committer');
-      if (author == committer) return author;
-      if (author && committer) return `${author} and ${committer}`;
-      return author || committer;
+      const a = user(cmt, 'author');
+      const c = user(cmt, 'committer');
+      if (a && c && a != c) return `${a} and ${c}`;
+      return a || c;
     }
 
     function user(cmt, userType) {
-      return cmt[userType] && cmt[userType].login && ('@' + cmt[userType].login) || cmt.commit[userType].name;
+      return cmt[userType] && cmt[userType].login
+              ? '@' + cmt[userType].login
+              : cmt.commit[userType].name;
     }
 
     function uniques(arr) {