diff --git a/spec/git.spec.js b/spec/git.spec.js index 0807598c..b54e5b32 100644 --- a/spec/git.spec.js +++ b/spec/git.spec.js @@ -240,5 +240,12 @@ describe('Git', function() { ); }); + it('will throw error if bad commits given to interactive test', function() { + expectTreeAsync( + 'gc; git rebase HEAD~2 -i --interactive-test C2,C100; gc', + '{"branches":{"master":{"target":"C3","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}' + ); + }); + }); diff --git a/src/js/git/commands.js b/src/js/git/commands.js index 4dc5abe9..2633efdd 100644 --- a/src/js/git/commands.js +++ b/src/js/git/commands.js @@ -590,8 +590,7 @@ var commandConfig = { interactiveTest: commandOptions['--interactive-test'] } ); - } - else { + } else { engine.rebaseInteractive( args[0], args[1], { diff --git a/src/js/git/index.js b/src/js/git/index.js index f61c67bd..ed3799e6 100644 --- a/src/js/git/index.js +++ b/src/js/git/index.js @@ -2139,7 +2139,9 @@ GitEngine.prototype.rebaseInteractiveTest = function(targetSource, currentLocati }); if (extraCommits.length > 0) { - // What to do here? + throw new GitError({ + msg: intl.todo('Hey those commits dont exist in the set!') + }); } }