fix definition of ancestor

git believes that a hash is its own ancestor!

1 files changed, 11 insertions, 1 deletions

diff --git a/dot/local/bin/git-ll-remote b/dot/local/bin/git-ll-remote
index 88211c4..3cc4130 100755
--- a/dot/local/bin/git-ll-remote
+++ b/dot/local/bin/git-ll-remote
@@ -64,13 +64,23 @@ git_fetch()
     have_ref "$hash" || git fetch "$remote" "$ref"
 }
 
+is_ancestor()
+{
+    if [ "$1" = "$2 " ]
+    then false
+    elif [ "$(git rev-parse "$1")" = "$(git rev-parse "$2")" ]
+    then false
+    else git merge-base --is-ancestor "$1" "$2"
+    fi
+}
+
 handle_hash_ref()
 {
     local hash="$1" ref="$2"
     git_fetch "$hash" "$ref" || exit
 
     [ "$OPT_r" ] && set -- "$hash" HEAD || set -- HEAD "$hash"
-    if [ "$OPT_a" ] || git merge-base --is-ancestor "$1" "$2"
+    if [ "$OPT_a" ] || is_ancestor "$1" "$2"
     then
         if [ ! "$OPT_q" -a "$listed" -eq 0 ]
         then