mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 15:38:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Issue #223 micro-optimization and test coverage

Browse source
This commit is contained in:
Peter Cottle 2014-11-29 16:38:09 -08:00
parent 7b687ab6da
commit 2f62817dff
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
spec/git.spec.js
View file

@ -247,5 +247,12 @@ describe('Git', function() {
); );
}); });
it('will correctly resolve the dependency order of commits when fetching or pushing', function() {
expectTreeAsync(
'git clone; git commit; git commit; git commit; git checkout -b test C2; git commit; git checkout master; git push; git checkout master; git merge test; git commit; git push; git checkout test; git commit; git commit; git checkout -b feat1 master; git commit; git merge test; git checkout master; git merge test; git checkout feat1; git commit; git checkout master; git merge feat1; git push',
'{"branches":{"master":{"target":"C7","id":"master","remoteTrackingBranchID":"o/master"},"o/master":{"target":"C4","id":"o/master","remoteTrackingBranchID":null},"test":{"target":"C5","id":"test","remoteTrackingBranchID":null}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"},"C3":{"parents":["C2"],"id":"C3"},"C4":{"parents":["C3"],"id":"C4"},"C5":{"parents":["C2"],"id":"C5"},"C6":{"parents":["C4","C5"],"id":"C6"},"C7":{"parents":["C6"],"id":"C7"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C4","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"},"C4":{"parents":["C3"],"id":"C4"}},"tags":{},"HEAD":{"target":"master","id":"HEAD"}}}'
);
});
}); });

2
src/js/git/index.js
View file

@ -1029,8 +1029,6 @@ GitEngine.prototype.getTargetGraphDifference = function(
differenceUnique.splice(i, 1); differenceUnique.splice(i, 1);
// expand target set // expand target set
targetSet[makeThis.id] = true; targetSet[makeThis.id] = true;
// start over
break;
} }
} }
return inOrder; return inOrder;