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

Fixes Issue #68 flip logic and getCommitFromRef

Browse source
This commit is contained in:
Peter Cottle 2013-03-07 21:27:28 -08:00
parent 44db45ce0d
commit e2ecfef4f4
8 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -546,7 +546,7 @@ GitEngine.prototype.cherrypickStarter = function() {
var set = this.getUpstreamSet('HEAD');
// first resolve all the refs (as an error check)
_.each(this.generalArgs, function(arg) {
var commit = this.resolveID(arg);
var commit = this.getCommitFromRef(arg);
// and check that its not upstream
if (set[commit.get('id')]) {
throw new GitError({
@ -570,7 +570,7 @@ GitEngine.prototype.cherrypickStarter = function() {
var afterSnapshot;
var newCommit;
_.each(this.generalArgs, function(arg) {
var oldCommit = this.resolveID(arg);
var oldCommit = this.getCommitFromRef(arg);
animationResponse.toRebaseArray.push(oldCommit);
newCommit = this.cherrypick(arg);