git-ll-remote: improved reporting; fixes

1 files changed, 23 insertions, 19 deletions

diff --git a/dot/local/bin/git-ll-remote b/dot/local/bin/git-ll-remote
index a0e689b..88211c4 100755
--- a/dot/local/bin/git-ll-remote
+++ b/dot/local/bin/git-ll-remote
@@ -48,33 +48,37 @@ show_reverse_message()
            ''
 }
 
+show_message()
+{
+    if [ "$OPT_a" ]
+    then show_all_message
+    elif [ "$OPT_r" ]
+    then show_reverse_message
+    else show_normal_message
+    fi
+}
+
+git_fetch()
+{
+    local hash="$1" ref="$2"
+    have_ref "$hash" || git fetch "$remote" "$ref"
+}
+
 handle_hash_ref()
 {
     local hash="$1" ref="$2"
-    if ! have_ref $hash
-    then
-        git fetch $remote $ref;
-    fi
-    if [ -z "$OPT_r" ]
-    then
-        cmd="git merge-base --is-ancestor HEAD $hash"
-    else
-        cmd="git merge-base --is-ancestor $hash HEAD"
-    fi
-    if [ "$OPT_a" ] || $cmd
+    git_fetch "$hash" "$ref" || exit
+
+    [ "$OPT_r" ] && set -- "$hash" HEAD || set -- HEAD "$hash"
+    if [ "$OPT_a" ] || git merge-base --is-ancestor "$1" "$2"
     then
-        if ! [ "$OPT_q" ]
+        if [ ! "$OPT_q" -a "$listed" -eq 0 ]
         then
-            if [ "$OPT_a" ]
-            then show_all_message
-            elif [ "$OPT_r" -a "$listed" -eq 0 ]
-            then show_reverse_message
-            else show_normal_message
-            fi
+            show_message
         fi
 
         >&2 printf 'remote: %s\n' "$ref"
-        git show $hash | sed '/^$/q'
+        git show "$hash" | sed '/^$/q'
         listed=$((listed + 1))
     else
         skipped=$((skipped + 1))