Merge branch 'nd/struct-pathspec'

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 4da72aefbd226f6f42af381b5d5a5a3178414576..1cc2ba6e09614fa55ad205145a3bdacfb78bf283 100644 (file)
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -89,7 +89,13 @@ get_remote_merge_branch () {
            refs/heads/*) remote=${remote#refs/heads/} ;;
            refs/* | tags/* | remotes/* ) remote=
            esac
-
-           [ -n "$remote" ] && echo "refs/remotes/$repo/$remote"
+           [ -n "$remote" ] && case "$repo" in
+               .)
+                   echo "refs/heads/$remote"
+                   ;;
+               *)
+                   echo "refs/remotes/$repo/$remote"
+                   ;;
+           esac
        esac
 }