From 2888a63b987dfa75dc956995e538db7d6ae3a40d Mon Sep 17 00:00:00 2001
From: Jorge Bucaran <mail@jorgebucaran.com>
Date: Tue, 29 Mar 2016 01:21:51 +0900
Subject: [PATCH] Simplify update mechanism, avoid merges.

---
 functions/__fisher_path_update.fish | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/functions/__fisher_path_update.fish b/functions/__fisher_path_update.fish
index f7a0e24..14b75f7 100644
--- a/functions/__fisher_path_update.fish
+++ b/functions/__fisher_path_update.fish
@@ -1,12 +1,19 @@
 function __fisher_path_update -a path
     pushd $path
 
-    if not git pull --quiet --rebase origin master
-        git rebase --abort
-        git fetch --quiet origin master
-        git reset --quiet --hard FETCH_HEAD
-        git clean --quiet -dx --force
-    end ^ /dev/null
+    git fetch --quiet origin master ^ /dev/null
+
+    set -l commits (
+        git rev-list --left-right --count "master..FETCH_HEAD" ^ /dev/null | cut -d\t -f2)
+
+    git reset --quiet --hard FETCH_HEAD
+    git clean -qdfx
 
     popd
+
+    if test "$commits" -eq 0 -o -z "$commits"
+        return 1
+    end
+
+    printf "%s\n" "$commits"
 end