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 remote branch grabbing

Browse source
This commit is contained in:
Peter Cottle 2013-09-09 12:15:46 -07:00
parent 6291baf665
commit cfea67ecce
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/bundle.js
View file

@ -8108,7 +8108,7 @@ GitEngine.prototype.push = function(options) {
// HAX HAX update master and remote tracking for master
chain = chain.then(_.bind(function() {
var localCommit = this.getCommitFromRef(localBranch);
var remoteBranchID = ORIGIN_PREFIX + localBranch.getID();
var remoteBranchID = localBranch.getRemoteTrackingBranchID();
// less hacks hax
this.setTargetLocation(this.refs[remoteBranchID], localCommit);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);
@ -26565,7 +26565,7 @@ GitEngine.prototype.push = function(options) {
// HAX HAX update master and remote tracking for master
chain = chain.then(_.bind(function() {
var localCommit = this.getCommitFromRef(localBranch);
var remoteBranchID = ORIGIN_PREFIX + localBranch.getID();
var remoteBranchID = localBranch.getRemoteTrackingBranchID();
// less hacks hax
this.setTargetLocation(this.refs[remoteBranchID], localCommit);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);

1
build/bundle.min.3bbe8ceb.js
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.cb90f183.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

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

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

@ -888,7 +888,7 @@ GitEngine.prototype.push = function(options) {
// HAX HAX update master and remote tracking for master
chain = chain.then(_.bind(function() {
var localCommit = this.getCommitFromRef(localBranch);
var remoteBranchID = ORIGIN_PREFIX + localBranch.getID();
var remoteBranchID = localBranch.getRemoteTrackingBranchID();
// less hacks hax
this.setTargetLocation(this.refs[remoteBranchID], localCommit);
return this.animationFactory.playRefreshAnimation(this.gitVisuals);