Skip to content
Browse files

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 <junkio@cox.net>
  • Loading branch information...
1 parent 7d1864c commit 4b441f47cefe7f4861167a151a395606e1a16745 Junio C Hamano committed Jan 7, 2007
Showing with 13 additions and 4 deletions.
  1. +5 −4 git-fetch.sh
  2. +8 −0 git-sh-setup.sh
View
9 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
View
8 git-sh-setup.sh
@@ -28,6 +28,14 @@ set_reflog_action() {
fi
}
+is_bare_repository () {
+ git-repo-config --bool --get core.bare ||
+ case "$GIT_DIR" in
+ .git | */.git) echo false ;;
+ *) echo true ;;
+ esac
+}
+
if [ -z "$LONG_USAGE" ]
then
LONG_USAGE="Usage: $0 $USAGE"

0 comments on commit 4b441f4

Please sign in to comment.
Something went wrong with that request. Please try again.