mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 08:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

better refreshing

Browse source
This commit is contained in:
Peter Cottle 2012-09-29 11:58:07 -07:00
parent f78e77e5c6
commit bc4b9246eb
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/git.js
View file

@ -492,9 +492,10 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
if (this.isUpstreamOf(currentLocation, targetSource)) {
// just set the target of this current location to the source
this.setLocationTarget(currentLocation, this.getCommitFromRef(targetSource));
throw new CommandResult({
msg: 'Fast-forwarding...'
});
// we need the refresh tree animation to happen, so set the result directly
// instead of throwing
this.command.setResult('Fast-forwarding...');
return;
}
// now the part of actually rebasing.