mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-16 09:34:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix test 'rebase onto fast forward'

Browse source
This commit is contained in:
Qusijue 2021-08-13 21:05:49 +05:00
parent 87684bbdc8
commit ff28276c45
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
__tests__/git.spec.js
View file

@ -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"}}'
);
});