From 6989dc7c7fe4f4ffec3453d62ce339fb5783ef4d Mon Sep 17 00:00:00 2001
From: Jorge Bucaran <jbucaran@gmail.com>
Date: Wed, 2 Mar 2016 10:39:13 +0900
Subject: [PATCH] Fix regression causing update to fail in some plugins.

---
 functions/__fisher_path_update.fish | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/functions/__fisher_path_update.fish b/functions/__fisher_path_update.fish
index dbc00cb..22f6fee 100644
--- a/functions/__fisher_path_update.fish
+++ b/functions/__fisher_path_update.fish
@@ -7,22 +7,21 @@ function __fisher_path_update -a path
         return 1
     end
 
-    if test "$branch" != master
-        git stash --quiet ^ /dev/null
-        git checkout master --quiet ^ /dev/null
-    end
+    git stash --quiet ^ /dev/null
+    git checkout master --quiet ^ /dev/null
 
-    if not git pull --rebase origin master --quiet ^ /dev/null
+    if not git pull --rebase origin master --quiet
         git rebase --abort --quiet
         git fetch origin master --quiet
         git reset --hard FETCH_HEAD --quiet
         git clean -d --force --quiet
-    end
+    end ^ /dev/null
 
-    if test "$branch" != master
+    if test ! -z "$branch"
         git checkout "$branch" --quiet
-        git stash apply --quiet ^ /dev/null
     end
 
+    git stash apply --quiet ^ /dev/null
+    
     popd
 end