commit fe249b4219f66ae3aacfac50ad19b38c370ad115
author Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Sat Nov 13 23:58:22 2010 +0100
committer Junio C Hamano <gitster@pobox.com> Mon Nov 29 15:06:40 2010 -0800
tree 1856bcb80e9f3306e26f6b325b6a0964ed2c6d1c
parent 7d43de925b2771d295d8fc4341b7bd544e2a74fa

Use reflog in 'pull --rebase . foo'

Since c85c792 (pull --rebase: be cleverer with rebased upstream
branches, 2008-01-26), "git pull --rebase" has used the reflog to try to
rebase from the old upstream onto the new upstream.

Make this work if the local repository is explicitly passed on the
command line as in 'git pull --rebase . foo'.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Acked-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-parse-remote.sh

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 5f47b18..375a0ba 100644
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -89,7 +89,13 @@
 	    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
 }