From ff28276c452aa8ef79aadc45e425a781e6e0b797 Mon Sep 17 00:00:00 2001 From: Qusijue Date: Fri, 13 Aug 2021 21:05:49 +0500 Subject: [PATCH] fix test 'rebase onto fast forward' --- __tests__/git.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/git.spec.js b/__tests__/git.spec.js index f1e14629..ac97d00c 100644 --- a/__tests__/git.spec.js +++ b/__tests__/git.spec.js @@ -441,7 +441,7 @@ describe('Git', function() { it('rebase onto fast forward', function() { return expectTreeAsync( - 'git switch -c F1; git commit; git switch -c F1; git commit;', + 'git switch -c F1; git commit; git rebase --onto F1 main;', '{"branches":{"main":{"target":"C1","id":"main","remoteTrackingBranchID":null},"F1":{"target":"C2","id":"F1","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"tags":{},"HEAD":{"target":"F1","id":"HEAD"}}' ); });