Issue #130 -- hangs after pull uncaught result

README.md

@@ -125,4 +125,5 @@ Or reported an issue that was successfully closed!
 * Nicholas "LB" Braden
 * Jeffrey Jones
 * Kyle (kyleIDMI)
+* "iplus"
 

build/bundle.js

@@ -7244,6 +7244,13 @@ var EventBaton = require('../util/eventBaton').EventBaton;
 
 var ORIGIN_PREFIX = 'o/';
 var TAB = '   ';
+var SHORT_CIRCUIT_CHAIN = 'STAPH';
+
+function catchShortCircuit(err) {
+  if (err !== SHORT_CIRCUIT_CHAIN) {
+    throw err;
+  }
+}
 
 function GitEngine(options) {
   this.rootCommit = null;
@@ -8191,16 +8198,19 @@ GitEngine.prototype.fetch = function(options) {
   // then we get the difference in commits between these two graphs
   var commitsToMake = [];
   _.each(branchesToFetch, function(localRemoteBranch) {
-    options.dontThrowOnNoFetch = true;
     commitsToMake = commitsToMake.concat(this.getTargetGraphDifference(
       this,
       this.origin,
       localRemoteBranch,
       this.origin.refs[localRemoteBranch.getBaseID()],
-      options
+      _.extend(
+        {},
+        options,
+        {dontThrowOnNoFetch: true}
+      )
     ));
   }, this);
-  if (!commitsToMake.length) {
+  if (!commitsToMake.length && !options.dontThrowOnNoFetch) {
     throw new GitError({
       msg: intl.str('git-error-origin-fetch-uptodate')
     });
@@ -8350,6 +8360,20 @@ 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)) {
+      this.command.set('error', new CommandResult({
+        msg: intl.str('git-result-uptodate')
+      }));
+      throw SHORT_CIRCUIT_CHAIN;
+    }
+  }, this));
+
   // delay a bit after the intense refresh animation from
   // fetch
   chain = chain.then(_.bind(function() {
@@ -8389,6 +8413,7 @@ GitEngine.prototype.pullFinishWithMerge = function(
       this.gitVisuals
     );
   }, this));
+  chain = chain.fail(catchShortCircuit);
 
   this.animationQueue.thenFinish(chain, deferred);
 };
@@ -9197,12 +9222,17 @@ GitEngine.prototype.rebaseFinish = function(
   return chain;
 };
 
+GitEngine.prototype.mergeCheck = function(targetSource, currentLocation) {
+  var sameCommit = this.getCommitFromRef(targetSource) ===
+    this.getCommitFromRef(currentLocation);
+  return this.isUpstreamOf(targetSource, currentLocation) || sameCommit;
+};
+
 GitEngine.prototype.merge = function(targetSource) {
   var currentLocation = 'HEAD';
 
   // first some conditions
-  if (this.isUpstreamOf(targetSource, currentLocation) ||
+  if (this.mergeCheck(targetSource, currentLocation)) {
-      this.getCommitFromRef(targetSource) === this.getCommitFromRef(currentLocation)) {
     throw new CommandResult({
       msg: intl.str('git-result-uptodate')
     });
@@ -26061,6 +26091,13 @@ var EventBaton = require('../util/eventBaton').EventBaton;
 
 var ORIGIN_PREFIX = 'o/';
 var TAB = '   ';
+var SHORT_CIRCUIT_CHAIN = 'STAPH';
+
+function catchShortCircuit(err) {
+  if (err !== SHORT_CIRCUIT_CHAIN) {
+    throw err;
+  }
+}
 
 function GitEngine(options) {
   this.rootCommit = null;
@@ -27008,16 +27045,19 @@ GitEngine.prototype.fetch = function(options) {
   // then we get the difference in commits between these two graphs
   var commitsToMake = [];
   _.each(branchesToFetch, function(localRemoteBranch) {
-    options.dontThrowOnNoFetch = true;
     commitsToMake = commitsToMake.concat(this.getTargetGraphDifference(
       this,
       this.origin,
       localRemoteBranch,
       this.origin.refs[localRemoteBranch.getBaseID()],
-      options
+      _.extend(
+        {},
+        options,
+        {dontThrowOnNoFetch: true}
+      )
     ));
   }, this);
-  if (!commitsToMake.length) {
+  if (!commitsToMake.length && !options.dontThrowOnNoFetch) {
     throw new GitError({
       msg: intl.str('git-error-origin-fetch-uptodate')
     });
@@ -27167,6 +27207,20 @@ 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)) {
+      this.command.set('error', new CommandResult({
+        msg: intl.str('git-result-uptodate')
+      }));
+      throw SHORT_CIRCUIT_CHAIN;
+    }
+  }, this));
+
   // delay a bit after the intense refresh animation from
   // fetch
   chain = chain.then(_.bind(function() {
@@ -27206,6 +27260,7 @@ GitEngine.prototype.pullFinishWithMerge = function(
       this.gitVisuals
     );
   }, this));
+  chain = chain.fail(catchShortCircuit);
 
   this.animationQueue.thenFinish(chain, deferred);
 };
@@ -28014,12 +28069,17 @@ GitEngine.prototype.rebaseFinish = function(
   return chain;
 };
 
+GitEngine.prototype.mergeCheck = function(targetSource, currentLocation) {
+  var sameCommit = this.getCommitFromRef(targetSource) ===
+    this.getCommitFromRef(currentLocation);
+  return this.isUpstreamOf(targetSource, currentLocation) || sameCommit;
+};
+
 GitEngine.prototype.merge = function(targetSource) {
   var currentLocation = 'HEAD';
 
   // first some conditions
-  if (this.isUpstreamOf(targetSource, currentLocation) ||
+  if (this.mergeCheck(targetSource, currentLocation)) {
-      this.getCommitFromRef(targetSource) === this.getCommitFromRef(currentLocation)) {
     throw new CommandResult({
       msg: intl.str('git-result-uptodate')
     });

index.html

@@ -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.js"></script>
+  <script src="build/bundle.min.66308339.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

spec/remote.spec.js

@@ -78,5 +78,12 @@ describe('Git Remotes', function() {
       '{"branches":{"master":{"target":"C1","id":"master"},"bugFix":{"target":"C1","id":"bugFix"},"o/master":{"target":"C2","id":"o/master"},"o/bugFix":{"target":"C1","id":"o/bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C2","id":"master"},"bugFix":{"target":"C1","id":"bugFix"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"}}}'
     );
   });
+
+  it('pulls with nothing and then commits', function() {
+    expectTreeAsync(
+      'git clone; git pull; git commit',
+      '{"branches":{"master":{"target":"C2","id":"master"},"o/master":{"target":"C1","id":"o/master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"},"C2":{"parents":["C1"],"id":"C2"}},"HEAD":{"target":"master","id":"HEAD"},"originTree":{"branches":{"master":{"target":"C1","id":"master"}},"commits":{"C0":{"parents":[],"id":"C0","rootCommit":true},"C1":{"parents":["C0"],"id":"C1"}},"HEAD":{"target":"master","id":"HEAD"}}}'
+    );
+  });
 });
 

src/js/git/index.js

@@ -18,6 +18,13 @@ var EventBaton = require('../util/eventBaton').EventBaton;
 
 var ORIGIN_PREFIX = 'o/';
 var TAB = '   ';
+var SHORT_CIRCUIT_CHAIN = 'STAPH';
+
+function catchShortCircuit(err) {
+  if (err !== SHORT_CIRCUIT_CHAIN) {
+    throw err;
+  }
+}
 
 function GitEngine(options) {
   this.rootCommit = null;
@@ -965,16 +972,19 @@ GitEngine.prototype.fetch = function(options) {
   // then we get the difference in commits between these two graphs
   var commitsToMake = [];
   _.each(branchesToFetch, function(localRemoteBranch) {
-    options.dontThrowOnNoFetch = true;
     commitsToMake = commitsToMake.concat(this.getTargetGraphDifference(
       this,
       this.origin,
       localRemoteBranch,
       this.origin.refs[localRemoteBranch.getBaseID()],
-      options
+      _.extend(
+        {},
+        options,
+        {dontThrowOnNoFetch: true}
+      )
     ));
   }, this);
-  if (!commitsToMake.length) {
+  if (!commitsToMake.length && !options.dontThrowOnNoFetch) {
     throw new GitError({
       msg: intl.str('git-error-origin-fetch-uptodate')
     });
@@ -1124,6 +1134,20 @@ 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)) {
+      this.command.set('error', new CommandResult({
+        msg: intl.str('git-result-uptodate')
+      }));
+      throw SHORT_CIRCUIT_CHAIN;
+    }
+  }, this));
+
   // delay a bit after the intense refresh animation from
   // fetch
   chain = chain.then(_.bind(function() {
@@ -1163,6 +1187,7 @@ GitEngine.prototype.pullFinishWithMerge = function(
       this.gitVisuals
     );
   }, this));
+  chain = chain.fail(catchShortCircuit);
 
   this.animationQueue.thenFinish(chain, deferred);
 };
@@ -1971,12 +1996,17 @@ GitEngine.prototype.rebaseFinish = function(
   return chain;
 };
 
+GitEngine.prototype.mergeCheck = function(targetSource, currentLocation) {
+  var sameCommit = this.getCommitFromRef(targetSource) ===
+    this.getCommitFromRef(currentLocation);
+  return this.isUpstreamOf(targetSource, currentLocation) || sameCommit;
+};
+
 GitEngine.prototype.merge = function(targetSource) {
   var currentLocation = 'HEAD';
 
   // first some conditions
-  if (this.isUpstreamOf(targetSource, currentLocation) ||
+  if (this.mergeCheck(targetSource, currentLocation)) {
-      this.getCommitFromRef(targetSource) === this.getCommitFromRef(currentLocation)) {
     throw new CommandResult({
       msg: intl.str('git-result-uptodate')
     });