Skip to content

Commit 766d3dd

Browse files
author
Carson Howard
committed
Fixed error in continueRebase
1 parent 0f38993 commit 766d3dd

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

lib/repository.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,13 @@ Repository.prototype.continueRebase = function(
449449
})
450450
.then(function(_rebase) {
451451
rebase = _rebase;
452-
return rebase.commit(null, signature);
452+
return rebase.commit(null, signature)
453+
.catch(function() {
454+
// we are ignoring errors. This is to prevent issues caused by making this async
455+
return 0;
456+
});
453457
})
454-
.then(function(oid) {
458+
.then(function() {
455459
return performRebase(
456460
repo,
457461
rebase,

0 commit comments

Comments
 (0)