Keep rename/rename conflicts of intermediate merges while doing recursive merge
[git/mingw/j6t.git] / git-sh-setup.sh
blobf24c7f2d23c13e9874308a019f3c0f93225de3c0
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 set_reflog_action() {
24 if [ -z "${GIT_REFLOG_ACTION:+set}" ]
25 then
26 GIT_REFLOG_ACTION="$*"
27 export GIT_REFLOG_ACTION
31 is_bare_repository () {
32 git-config --bool --get core.bare ||
33 case "$GIT_DIR" in
34 .git | */.git) echo false ;;
35 *) echo true ;;
36 esac
39 cd_to_toplevel () {
40 cdup=$(git-rev-parse --show-cdup)
41 if test ! -z "$cdup"
42 then
43 cd "$cdup" || {
44 echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
45 exit 1
50 require_work_tree () {
51 test $(is_bare_repository) = false &&
52 test $(git-rev-parse --is-inside-git-dir) = false ||
53 die "fatal: $0 cannot be used without a working tree."
56 if [ -z "$LONG_USAGE" ]
57 then
58 LONG_USAGE="Usage: $0 $USAGE"
59 else
60 LONG_USAGE="Usage: $0 $USAGE
62 $LONG_USAGE"
65 case "$1" in
66 -h|--h|--he|--hel|--help)
67 echo "$LONG_USAGE"
68 exit
69 esac
71 # Make sure we are in a valid repository of a vintage we understand.
72 if [ -z "$SUBDIRECTORY_OK" ]
73 then
74 : ${GIT_DIR=.git}
75 GIT_DIR=$(GIT_DIR="$GIT_DIR" git-rev-parse --git-dir) || {
76 exit=$?
77 echo >&2 "You need to run this command from the toplevel of the working tree."
78 exit $exit
80 else
81 GIT_DIR=$(git-rev-parse --git-dir) || exit
83 : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}