mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 07:28:35 +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

1
README.md
View file

@ -107,4 +107,5 @@ Or reported an issue that was successfully closed!
* Matthew Walker
* Duane Johnson
* Neil Chue Hong
* "Goodwine"

12
build/bundle.js
View file

@ -8671,7 +8671,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({
@ -8695,7 +8695,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);
@ -15671,7 +15671,7 @@ function GitVisuals(options) {
min: 0,
max: 1
};
this.flipFraction = 0.51;
this.flipFraction = 0.65;
var Main = require('../app');
Main.getEvents().on('refreshTree', this.refreshTree, this);
@ -22291,7 +22291,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({
@ -22315,7 +22315,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);
@ -29852,7 +29852,7 @@ function GitVisuals(options) {
min: 0,
max: 1
};
this.flipFraction = 0.51;
this.flipFraction = 0.65;
var Main = require('../app');
Main.getEvents().on('refreshTree', this.refreshTree, this);

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

File diff suppressed because one or more lines are too long

1
build/bundle.min.ca78b51d.js Normal file
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

@ -412,7 +412,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.min.af985bd7.js"></script>
<script src="build/bundle.min.ca78b51d.js"></script>
<!-- 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

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);

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

@ -43,7 +43,7 @@ function GitVisuals(options) {
min: 0,
max: 1
};
this.flipFraction = 0.51;
this.flipFraction = 0.65;
var Main = require('../app');
Main.getEvents().on('refreshTree', this.refreshTree, this);