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

more pull work

Browse source
This commit is contained in:
Peter Cottle 2013-10-22 11:00:33 -07:00
parent b8cf7f75c0
commit 749a303904
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spec/remote.spec.js
View file

@ -268,5 +268,12 @@ describe('Git Remotes', function() {
);
});
it('pulls to the right branch and destination', function() {
expectTreeAsync(
'git clone; git checkout -b side o/master;git fakeTeamwork;git pull master:o/master',
'{"branches":{"master":{"target":"C1","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C2","id":"o/master","remoteTrackingBranchID":null},"side":{"target":"C2","id":"side","remoteTrackingBranchID":"o/master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"side","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}}'
);
});
});