summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-07 02:17:52 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-07 21:36:35 -0800
commit4b441f47cefe7f4861167a151a395606e1a16745 (patch)
tree745a824bf251e485fc6bd6649bddc992b395994c
parent7d1864ce67d83485cf5cbc8c90fc170ee884ef16 (diff)
downloadgit-4b441f47cefe7f4861167a151a395606e1a16745.tar.gz
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>
-rwxr-xr-xgit-fetch.sh9
-rwxr-xr-xgit-sh-setup.sh8
2 files changed, 13 insertions, 4 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index 466fe59e35..c58704d794 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
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index 87b939c0e4..7fdc912167 100755
--- a/git-sh-setup.sh
+++ b/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"