git-revert with conflicts to behave as git-merge with conflicts
[git/jrn.git] / git-sh-setup.sh
blob42f9b1c125578a7158392b53ec8792d6c6bbb273
1 #!/bin/sh
3 # This is included in commands that either have to be run from the toplevel
4 # of the repository, or with GIT_DIR environment variable properly.
5 # If the GIT_DIR does not look like the right correct git-repository,
6 # it dies.
8 # Having this variable in your environment would break scripts because
9 # you would cause "cd" to be be taken to unexpected places. If you
10 # like CDPATH, define it for your interactive shell sessions without
11 # exporting it.
12 unset CDPATH
14 die() {
15 echo >&2 "$@"
16 exit 1
19 usage() {
20 die "Usage: $0 $USAGE"
23 if [ -z "$LONG_USAGE" ]
24 then
25 LONG_USAGE="Usage: $0 $USAGE"
26 else
27 LONG_USAGE="Usage: $0 $USAGE
29 $LONG_USAGE"
32 case "$1" in
33 -h|--h|--he|--hel|--help)
34 echo "$LONG_USAGE"
35 exit
36 esac
38 # Make sure we are in a valid repository of a vintage we understand.
39 if [ -z "$SUBDIRECTORY_OK" ]
40 then
41 : ${GIT_DIR=.git}
42 GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || exit
43 else
44 GIT_DIR=$(git-rev-parse --git-dir) || exit
46 : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}