Not starting a build if we are on master

Author: elicwhite

libs/gitInfo.js

@@ -4,14 +4,6 @@ var exec = require('child_process').exec;
 
 function execute(cmd, cb) {
   exec(cmd, function (err, stdout, stderr) {
-    if(err) {
-      console.error('err', err);
-    }
-
-    if(stderr) {
-      console.error('err', err);
-    }
-
     cb(stdout.split('\n').join(''));
   });
 }
@@ -55,6 +47,16 @@ var GitInfo = {
         resolve(data);
       });
     });
+  },
+
+  isOnBranch: function(sha, branch) {
+    return new Bluebird(function(resolve) {
+      var command = 'git rev-list ' + branch + ' | grep ' + sha;
+
+      execute(command, function(data) {
+        resolve(data !== '');
+      });
+    });
   }
 };
 

test/index.js

@@ -49,20 +49,25 @@ fs.removeAsync(config.screenshotRoot)
 
   console.log('Currently at', branchInfo.branch, branchInfo.sha);
 
-  return gitInfo.getCommonAncestor(branchInfo.sha, 'master')
-  .then(function(ancestor) {
-    if (ancestor !== branchInfo.sha) {
-      console.log('diffing against', ancestor);
-      return startBuild({
-        project: config.project,
-        head: branchInfo.sha,
-        base: ancestor,
-        numBrowsers: 1
-      })
-      .then(function(build) {
-        console.log('Build started', build.build);
-      });
+  return gitInfo.isOnBranch(branchInfo.sha, 'master')
+  .then(function(isOnMaster) {
+    if (isOnMaster) {
+      return;
     }
+
+    return gitInfo.getCommonAncestor(branchInfo.sha, 'master')
+    .then(function(ancestor) {
+        console.log('diffing against', ancestor);
+        return startBuild({
+          project: config.project,
+          head: branchInfo.sha,
+          base: ancestor,
+          numBrowsers: 1
+        })
+        .then(function(build) {
+          console.log('Build started', build.build);
+        });
+    });
   });
 })
 .then(function() {