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

Issue #131 awesomely now respect remote tracking branch info for git pull

Browse source
This commit is contained in:
Peter Cottle 2013-10-06 23:52:33 -07:00
parent 79d65e739a
commit 7034eb76fa
8 changed files with 227 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1079,8 +1079,8 @@ GitEngine.prototype.fetch = function(options) {
GitEngine.prototype.pull = function(options) {
options = options || {};
var localBranch = this.refs['master'];
var remoteBranch = this.refs['o/master'];
var localBranch = this.getOneBeforeCommit('HEAD');
var remoteBranch = this.refs[options.source];
// no matter what fetch
var pendingFetch = this.fetch({
@ -1143,13 +1143,8 @@ GitEngine.prototype.pullFinishWithMerge = function(
var chain = pendingFetch.chain;
var deferred = pendingFetch.deferred;
// TODO -- hax hax. need to loop all branches
// first lets check if we even need to merge (TODO -- expand this)
var currentLocation = 'master';
var targetSource = 'o/master';
chain = chain.then(_.bind(function() {
if (this.mergeCheck(targetSource, currentLocation)) {
if (this.mergeCheck(remoteBranch, localBranch)) {
this.command.set('error', new CommandResult({
msg: intl.str('git-result-uptodate')
}));
@ -1185,7 +1180,7 @@ GitEngine.prototype.pullFinishWithMerge = function(
return this.animationFactory.getDelayedPromise(700);
}, this));
chain = chain.then(_.bind(function() {
var newCommit = this.merge('o/master');
var newCommit = this.merge(remoteBranch);
if (!newCommit) {
// it is a fast forward
return this.animationFactory.playRefreshAnimation(this.gitVisuals);