diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-01-15 21:56:05 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-15 23:35:07 (GMT) |
| commit | a0f4280f9e5decd384fe5cc9e30414b901aeb478 (patch) | |
| tree | 927157116ad3f3af9b1982c68cba6b35afd12948 /git-parse-remote.sh | |
| parent | 15261e3b33de3b49cc0a7d1b36b8685e02931ad7 (diff) | |
| download | git-a0f4280f9e5decd384fe5cc9e30414b901aeb478.zip git-a0f4280f9e5decd384fe5cc9e30414b901aeb478.tar.gz git-a0f4280f9e5decd384fe5cc9e30414b901aeb478.tar.bz2 | |
Fix git-fetch while on detached HEAD not to give needlessly alarming errors
When we are on a detached HEAD, there is no current branch.
There is no reason to leak the error messages to the end user
since this is a situation we expect to see.
This adds -q option to git-symbolic-ref to exit without issuing
an error message if the given name is not a symbolic ref.
By the way, with or without this patch, there currently is no
good way to tell failure modes between "git symbolic-ref HAED"
and "git symbolic-ref HEAD". Both says "is not a symbolic ref".
We may want to do something about it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-parse-remote.sh')
| -rwxr-xr-x | git-parse-remote.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index d2e4c2b..4fc6020 100755 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -49,7 +49,7 @@ get_remote_url () { } get_default_remote () { - curr_branch=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||') + curr_branch=$(git-symbolic-ref -q HEAD | sed -e 's|^refs/heads/||') origin=$(git-repo-config --get "branch.$curr_branch.remote") echo ${origin:-origin} } @@ -137,7 +137,7 @@ canon_refs_list_for_fetch () { shift if test "$remote" = "$(get_default_remote)" then - curr_branch=$(git-symbolic-ref HEAD | \ + curr_branch=$(git-symbolic-ref -q HEAD | \ sed -e 's|^refs/heads/||') merge_branches=$(git-repo-config \ --get-all "branch.${curr_branch}.merge") |