mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 17:27:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed a little rebase bug

Browse source
This commit is contained in:
Peter Cottle 2013-01-12 01:31:40 -08:00
parent 9249ef0604
commit bde5681573
6 changed files with 261 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -895,6 +895,9 @@ GitEngine.prototype.idSortFunc = function(cA, cB) {
GitEngine.prototype.dateSortFunc = function(cA, cB) {
var dateA = new Date(cA.get('createTime'));
var dateB = new Date(cB.get('createTime'));
if (dateA - dateB === 0) {
console.warn('WUT it is equal');
}
return dateA - dateB;
};
@ -975,6 +978,7 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
// keep searching
pQueue = pQueue.concat(popped.get('parents'));
}
console.log('this is what our rebase rough array is', toRebaseRough);
return this.rebaseFinish(toRebaseRough, stopSet, targetSource, currentLocation);
};
@ -1095,8 +1099,6 @@ GitEngine.prototype.rebaseFinish = function(toRebaseRough, stopSet, targetSource
});
}
// now reverse it once more to get it in the right order
toRebase.reverse();
animationResponse.toRebaseArray = toRebase.slice(0);
// now pop all of these commits onto targetLocation

1
src/js/views/rebaseView.js
View file

@ -57,6 +57,7 @@ var InteractiveRebaseView = ContainedBase.extend({
toRebase.unshift(this.rebaseMap[id]);
}
}, this);
toRebase.reverse();
this.deferred.resolve(toRebase);
// garbage collection will get us