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

fixed git push target graph difference method bug

Browse source
This commit is contained in:
Peter Cottle 2013-06-27 18:47:39 -07:00
parent c98f979885
commit fad9661f30
6 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
build/bundle.js
View file

@ -7839,7 +7839,18 @@ GitEngine.prototype.getTargetGraphDifference = function(
_.each(here.parents, pushParent); _.each(here.parents, pushParent);
} }
return difference.sort(function(cA, cB) { // filter because we werent doing graph search
var unique = {};
var differenceUnique = [];
_.forEach(difference, function(commit) {
if (unique[commit.id]) {
return;
}
unique[commit.id] = true;
differenceUnique.push(commit);
});
return differenceUnique.sort(function(cA, cB) {
// reverse sort by depth // reverse sort by depth
return cB.depth - cA.depth; return cB.depth - cA.depth;
}); });
@ -24004,7 +24015,18 @@ GitEngine.prototype.getTargetGraphDifference = function(
_.each(here.parents, pushParent); _.each(here.parents, pushParent);
} }
return difference.sort(function(cA, cB) { // filter because we werent doing graph search
var unique = {};
var differenceUnique = [];
_.forEach(difference, function(commit) {
if (unique[commit.id]) {
return;
}
unique[commit.id] = true;
differenceUnique.push(commit);
});
return differenceUnique.sort(function(cA, cB) {
// reverse sort by depth // reverse sort by depth
return cB.depth - cA.depth; return cB.depth - cA.depth;
}); });

1
build/bundle.min.13132f0d.js Normal file
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.c159cb3d.js
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -434,7 +434,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.min.c159cb3d.js"></script> <script src="build/bundle.min.13132f0d.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include

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

@ -794,7 +794,18 @@ GitEngine.prototype.getTargetGraphDifference = function(
_.each(here.parents, pushParent); _.each(here.parents, pushParent);
} }
return difference.sort(function(cA, cB) { // filter because we werent doing graph search
var unique = {};
var differenceUnique = [];
_.forEach(difference, function(commit) {
if (unique[commit.id]) {
return;
}
unique[commit.id] = true;
differenceUnique.push(commit);
});
return differenceUnique.sort(function(cA, cB) {
// reverse sort by depth // reverse sort by depth
return cB.depth - cA.depth; return cB.depth - cA.depth;
}); });