mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-30 01:34:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed merge case with existing commits

Browse source
This commit is contained in:
Peter Cottle 2013-07-07 13:42:42 -07:00
parent 87c787c8af
commit 67570f716d
7 changed files with 67 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/js/git/headless.js
View file

@ -26,10 +26,19 @@ function getMockFactory() {
}
// special method that does stuff
mockFactory.playRefreshAnimationAndFinish = function(gitVisuals, aQueue) {
console.log('trying to finish');
aQueue.thenFinish(Q.defer().promise);
};
mockFactory.playCommitBirthPromiseAnimation = function(commit, visuals) {
var d = Q.defer();
d.resolve();
return d.promise;
};
mockFactory.highlightEachWithPromise = function(chain, toRebase, destBranch) {
return chain;
};
return mockFactory;
}