From bc4b9246eb427defd0527fc72a40cd1e7facb2d0 Mon Sep 17 00:00:00 2001
From: Peter Cottle <petermcottle@gmail.com>
Date: Sat, 29 Sep 2012 11:58:07 -0700
Subject: [PATCH] better refreshing

---
 src/commandModel.js | 4 ++++
 src/git.js          | 7 ++++---
 todo.txt            | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/commandModel.js b/src/commandModel.js
index 91a7e624..e3e04cac 100644
--- a/src/commandModel.js
+++ b/src/commandModel.js
@@ -37,6 +37,10 @@ var Command = Backbone.Model.extend({
     }
   },
 
+  setResult: function(msg) {
+    this.set('result', msg);
+  },
+
   addWarning: function(msg) {
     this.get('warnings').push(msg);
     // change numWarnings so the change event fires. This is bizarre -- Backbone can't
diff --git a/src/git.js b/src/git.js
index cd204908..09eca65e 100644
--- a/src/git.js
+++ b/src/git.js
@@ -492,9 +492,10 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation) {
   if (this.isUpstreamOf(currentLocation, targetSource)) {
     // just set the target of this current location to the source
     this.setLocationTarget(currentLocation, this.getCommitFromRef(targetSource));
-    throw new CommandResult({
-      msg: 'Fast-forwarding...'
-    });
+    // we need the refresh tree animation to happen, so set the result directly
+    // instead of throwing
+    this.command.setResult('Fast-forwarding...');
+    return;
   }
 
   // now the part of actually rebasing.
diff --git a/todo.txt b/todo.txt
index d3c7ee9c..e362614a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -17,5 +17,5 @@ ALSO other big things:
 - Division in their rings based on how many / what branches they are part of
 - Color on branch edges??
 
-- sizing on visedge arrowheads, also fill most likely.
+- sizing on visedge arrowheads, also fill most likely