From 4b441f47cefe7f4861167a151a395606e1a16745 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 7 Jan 2007 02:17:52 -0800 Subject: git-fetch: allow updating the current branch in a bare repository. Sometimes, people have only fetch access into a bare repository that is used as a back-up location (or a distribution point) but does not have a push access for networking reasons, e.g. one end being behind a firewall, and updating the "current branch" in such a case is perfectly fine. This allows such a fetch without --update-head-ok, which is a flag that should never be used by end users otherwise. Signed-off-by: Junio C Hamano --- git-fetch.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'git-fetch.sh') diff --git a/git-fetch.sh b/git-fetch.sh index 466fe59e3..c58704d79 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -231,11 +231,12 @@ update_local_ref () { esac } -case "$update_head_ok" in -'') +# updating the current HEAD with git-fetch in a bare +# repository is always fine. +if test -z "$update_head_ok" && test $(is_bare_repository) = false +then orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) - ;; -esac +fi # If --tags (and later --heads or --all) is specified, then we are # not talking about defaults stored in Pull: line of remotes or -- cgit v1.2.1