diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:51 -0800 |
| commit | 73fd7f3761eeef0e28bbf04727c8a1e751a9792e (patch) | |
| tree | ee4e1e60de8c67ac5d83148b3880f14bf2d2f024 /git-parse-remote.sh | |
| parent | 25756cff935b9ef11f429bd5d05aa27045679d52 (diff) | |
| parent | fe249b4219f66ae3aacfac50ad19b38c370ad115 (diff) | |
| download | git-73fd7f3761eeef0e28bbf04727c8a1e751a9792e.tar.gz | |
Merge branch 'mz/pull-rebase-rebased'
* mz/pull-rebase-rebased:
Use reflog in 'pull --rebase . foo'
Diffstat (limited to 'git-parse-remote.sh')
| -rw-r--r-- | git-parse-remote.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 4da72aefbd..1cc2ba6e09 100644 --- 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 } |