diff options
| author | Leonid Volnitsky <Leonid@Volnitsky.com> | 2012-07-06 19:33:42 +0300 |
|---|---|---|
| committer | Leonid Volnitsky <Leonid@Volnitsky.com> | 2012-07-06 19:33:42 +0300 |
| commit | 64ee386e27a9497e2a9982bc148d374616b06a4b (patch) | |
| tree | e098a983b87a2fb6f10534bc05a496e1fd873310 | |
| parent | -- docs (diff) | |
| parent | added quotation marks around $git_dir/HEAD to prevent "detached" message from... (diff) | |
| download | git-prompt-64ee386e27a9497e2a9982bc148d374616b06a4b.tar.gz git-prompt-64ee386e27a9497e2a9982bc148d374616b06a4b.tar.bz2 git-prompt-64ee386e27a9497e2a9982bc148d374616b06a4b.zip | |
Merge branch 'master' of https://github.com/tomhoover/git-prompt into tomhoover-master
Conflicts:
git-prompt.sh
| -rwxr-xr-x | git-prompt.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index fae87a8..d6fba92 100755 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -445,8 +445,7 @@ parse_git_status() { ' )" - - if ! grep -q "^ref:" $git_dir/HEAD 2>/dev/null; then + if ! grep -q "^ref:" "$git_dir/HEAD" 2>/dev/null; then detached=detached fi |