From f94741324e26af42093a89e955ff9a923abff951 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Thu, 28 Dec 2006 02:34:48 -0500 Subject: Use GIT_REFLOG_ACTION environment variable instead. Junio rightly pointed out that the --reflog-action parameter was starting to get out of control, as most porcelain code needed to hand it to other porcelain and plumbing alike to ensure the reflog contained the top-level user action and not the lower-level actions it invoked. At Junio's suggestion we are introducing the new set_reflog_action function to all shell scripts, allowing them to declare early on what their default reflog name should be, but this setting only takes effect if the caller has not already set the GIT_REFLOG_ACTION environment variable. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'git-sh-setup.sh') diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 42f9b1c125..87b939c0e4 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -20,6 +20,14 @@ usage() { die "Usage: $0 $USAGE" } +set_reflog_action() { + if [ -z "${GIT_REFLOG_ACTION:+set}" ] + then + GIT_REFLOG_ACTION="$*" + export GIT_REFLOG_ACTION + fi +} + if [ -z "$LONG_USAGE" ] then LONG_USAGE="Usage: $0 $USAGE" -- cgit v1.2.1 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-sh-setup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'git-sh-setup.sh') 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" -- cgit v1.2.1 From 7eff28a9b42cb0d3aad932338b2e645fc6ed8fa9 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 30 Dec 2006 23:32:38 -0500 Subject: Disallow working directory commands in a bare repository. If the user tries to run a porcelainish command which requires a working directory in a bare repository they may get unexpected results which are difficult to predict and may differ from command to command. Instead we should detect that the current repository is a bare repository and refuse to run the command there, as there is no working directory associated with it. [jc: updated Shawn's original somewhat -- bugs are mine.] Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'git-sh-setup.sh') diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 7fdc912167..4a02b3825e 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -36,6 +36,11 @@ is_bare_repository () { esac } +require_work_tree () { + test $(is_bare_repository) = false || + die "fatal: $0 cannot be used without a working tree." +} + if [ -z "$LONG_USAGE" ] then LONG_USAGE="Usage: $0 $USAGE" -- cgit v1.2.1 From 120b0dfbed148461c4e1349d12a1b7913545260e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 12 Jan 2007 12:24:16 -0800 Subject: Explain "Not a git repository: '.git'". Andy Parkins noticed that the error message some "whole tree" oriented commands emit is stated misleadingly when they refused to run from a subdirectory. We could probably allow some of them to work from a subdirectory but that is a semantic change that could have unintended side effects, so let's start at first by rewording the error message to be easier to read without doing anything else to be safe. Signed-off-by: Junio C Hamano --- git-sh-setup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'git-sh-setup.sh') diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 4a02b3825e..57f7f77776 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -60,7 +60,11 @@ esac if [ -z "$SUBDIRECTORY_OK" ] then : ${GIT_DIR=.git} - GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || exit + GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || { + exit=$? + echo >&2 "You need to run this command from the toplevel of the working tree." + exit $exit + } else GIT_DIR=$(git-rev-parse --git-dir) || exit fi -- cgit v1.2.1