Skip to content

Commit b57ad11

Browse files
committed
Never diff against the same sha
1 parent ef655b0 commit b57ad11

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

test/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ fs.removeAsync(config.screenshotRoot)
4949

5050
console.log('Currently at', branchInfo.branch, branchInfo.sha);
5151

52-
if (branchInfo.branch !== 'master') {
53-
return gitInfo.getCommonAncestor(branchInfo.sha, 'master')
54-
.then(function(ancestor) {
52+
return gitInfo.getCommonAncestor(branchInfo.sha, 'master')
53+
.then(function(ancestor) {
54+
if (ancestor !== branchInfo.sha) {
5555
console.log('diffing against', ancestor);
5656
return startBuild({
5757
project: config.project,
@@ -62,8 +62,8 @@ fs.removeAsync(config.screenshotRoot)
6262
.then(function(build) {
6363
console.log('Build started', build.build);
6464
});
65-
});
66-
}
65+
}
66+
});
6767
})
6868
.then(function() {
6969
var client = webdriverio.remote(capabilities);

0 commit comments

Comments
 (0)