diff --git a/spec/first.spec.js b/spec/first.spec.js deleted file mode 100644 index d1f92a69..00000000 --- a/spec/first.spec.js +++ /dev/null @@ -1,6 +0,0 @@ -describe('Tests', function() { - it('should work', function() { - expect(1).toBeTruthy(); - }); -}); - diff --git a/src/js/git/index.js b/src/js/git/index.js index 2ad04560..3337c9e4 100644 --- a/src/js/git/index.js +++ b/src/js/git/index.js @@ -943,6 +943,9 @@ GitEngine.prototype.fetch = function(options) { remoteBranch, options ); + // remove the ones that already exist (and were missed by our + // upwards search) + commitsToMake = _.filter(commitsToMake if (commitsToMake.length === 0) { this.command.addWarning(intl.str( diff --git a/todo.txt b/todo.txt index a129c80a..46ec9d49 100644 --- a/todo.txt +++ b/todo.txt @@ -2,6 +2,13 @@ Mega Things ~~~~~~~~~~~~~~~~~~~~~~~~ [-] origin support +Before everything else: +~~~~~~~~~~~~~~~~~~~~~~~~~~ +[ ] fix tests by stubbing out animation factory to resolve promises +[ ] increase test coverage over everything + - unit and integration, but mostly for git operations +[ ] green refactor level compare + Intl TODO ~~~~~~~~~~~~~~~~~~~ [ ] translation script? might be too late...