Move better_branch_name above get_ref in merge-recursive.
[gitweb.git] / git-sh-setup.sh
index b4f10224baf8328a9d6efa761b025450df414bb2..87b939c0e4857ec9c9245c01f609a059788f656a 100755 (executable)
 # exporting it.
 unset CDPATH
 
-: ${GIT_DIR=.git}
-: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
-
 die() {
        echo >&2 "$@"
        exit 1
 }
 
+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"
+else
+       LONG_USAGE="Usage: $0 $USAGE
+
+$LONG_USAGE"
+fi
+
+case "$1" in
+       -h|--h|--he|--hel|--help)
+       echo "$LONG_USAGE"
+       exit
+esac
+
 # Make sure we are in a valid repository of a vintage we understand.
-GIT_DIR="$GIT_DIR" git-var GIT_AUTHOR_IDENT >/dev/null || exit
+if [ -z "$SUBDIRECTORY_OK" ]
+then
+       : ${GIT_DIR=.git}
+       GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || exit
+else
+       GIT_DIR=$(git-rev-parse --git-dir) || exit
+fi
+: ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}