mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 15:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Issue #130 -- slightly odd rebase animation fixed

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 22:48:04 -07:00
parent 73660f7126
commit 79d65e739a
6 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/js/git/index.js
View file

@ -1102,6 +1102,14 @@ GitEngine.prototype.pullFinishWithRebase = function(
) {
var chain = pendingFetch.chain;
var deferred = pendingFetch.deferred;
chain = chain.then(_.bind(function() {
if (this.isUpstreamOf(remoteBranch, localBranch)) {
this.command.set('error', new CommandResult({
msg: intl.str('git-result-uptodate')
}));
throw SHORT_CIRCUIT_CHAIN;
}
}, this));
// delay a bit after the intense refresh animation from
// fetch
@ -1122,6 +1130,7 @@ GitEngine.prototype.pullFinishWithRebase = function(
pendingFetch.dontResolvePromise = true;
return this.rebase(remoteBranch, localBranch, pendingFetch);
}, this));
chain = chain.fail(catchShortCircuit);
this.animationQueue.thenFinish(chain, deferred);
};