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

fixing some more bugs

Browse source
This commit is contained in:
Peter Cottle 2012-09-15 23:32:06 -07:00
parent 8ebb53b983
commit 94db9a3c7d
6 changed files with 37 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/git.js
View file

@ -692,7 +692,21 @@ GitEngine.prototype.dispatch = function(command, callback) {
});
command.set('status', 'processing');
this[command.get('method') + 'Starter']();
try {
this[command.get('method') + 'Starter']();
} catch (err) {
if (err instanceof GitError ||
err instanceof CommandResult) {
// short circuit animation by just setting error and returning
command.set('error', err);
callback();
return;
} else {
throw err;
}
}
// TODO (get rid of)
for (var i = 0; i < 3; i++) {