From a0f4280f9e5decd384fe5cc9e30414b901aeb478 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 15 Jan 2007 13:56:05 -0800 Subject: 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 --- git-parse-remote.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'git-parse-remote.sh') diff --git a/git-parse-remote.sh b/git-parse-remote.sh index d2e4c2b9a..4fc602082 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") -- cgit v1.2.1