am: suppress apply errors when using 3-way
[git/git.git] / git-sh-setup.sh
CommitLineData
b33e9666
LT
1#!/bin/sh
2#
ae2b0f15
JH
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.
b33e9666 7
365527ad 8# Having this variable in your environment would break scripts because
e598c517 9# you would cause "cd" to be taken to unexpected places. If you
365527ad
JH
10# like CDPATH, define it for your interactive shell sessions without
11# exporting it.
12unset CDPATH
13
61dbb3c4
JH
14git_broken_path_fix () {
15 case ":$PATH:" in
16 *:$1:*) : ok ;;
17 *)
18 PATH=$(
19 SANE_TOOL_PATH="$1"
20 IFS=: path= sep=
21 set x $PATH
22 shift
23 for elem
24 do
25 case "$SANE_TOOL_PATH:$elem" in
26 (?*:/bin | ?*:/usr/bin)
27 path="$path$sep$SANE_TOOL_PATH"
28 sep=:
29 SANE_TOOL_PATH=
30 esac
31 path="$path$sep$elem"
32 sep=:
33 done
34 echo "$path"
35 )
36 ;;
37 esac
38}
39
40# @@BROKEN_PATH_FIX@@
0e0aea5a 41
b33e9666 42die() {
8098a178 43 echo >&2 "$@"
b33e9666
LT
44 exit 1
45}
46
bac199b7
PH
47if test -n "$OPTIONS_SPEC"; then
48 usage() {
5d292756
JH
49 "$0" -h
50 exit 1
bac199b7
PH
51 }
52
e817e3e8
PH
53 parseopt_extra=
54 [ -n "$OPTIONS_KEEPDASHDASH" ] &&
55 parseopt_extra="--keep-dashdash"
56
57 eval "$(
cbea86fd 58 echo "$OPTIONS_SPEC" |
e817e3e8
PH
59 git rev-parse --parseopt $parseopt_extra -- "$@" ||
60 echo exit $?
61 )"
bac199b7 62else
1b1dd23f 63 dashless=$(basename "$0" | sed -e 's/-/ /')
bac199b7 64 usage() {
1b1dd23f 65 die "Usage: $dashless $USAGE"
bac199b7
PH
66 }
67
68 if [ -z "$LONG_USAGE" ]
69 then
1b1dd23f 70 LONG_USAGE="Usage: $dashless $USAGE"
bac199b7 71 else
1b1dd23f 72 LONG_USAGE="Usage: $dashless $USAGE
bac199b7
PH
73
74$LONG_USAGE"
75 fi
76
77 case "$1" in
78 -h|--h|--he|--hel|--help)
79 echo "$LONG_USAGE"
80 exit
81 esac
82fi
d025524d 83
f9474132
SP
84set_reflog_action() {
85 if [ -z "${GIT_REFLOG_ACTION:+set}" ]
86 then
87 GIT_REFLOG_ACTION="$*"
88 export GIT_REFLOG_ACTION
89 fi
90}
91
ef0c2abf 92git_editor() {
08874658
DK
93 : "${GIT_EDITOR:=$(git config core.editor)}"
94 : "${GIT_EDITOR:=${VISUAL:-${EDITOR}}}"
ef0c2abf
AR
95 case "$GIT_EDITOR,$TERM" in
96 ,dumb)
97 echo >&2 "No editor specified in GIT_EDITOR, core.editor, VISUAL,"
98 echo >&2 "or EDITOR. Tried to fall back to vi but terminal is dumb."
99 echo >&2 "Please set one of these variables to an appropriate"
100 echo >&2 "editor or run $0 with options that will not cause an"
101 echo >&2 "editor to be invoked (e.g., -m or -F for git-commit)."
102 exit 1
103 ;;
104 esac
08874658 105 eval "${GIT_EDITOR:=vi}" '"$@"'
ef0c2abf
AR
106}
107
4b441f47 108is_bare_repository () {
5be60078 109 git rev-parse --is-bare-repository
4b441f47
JH
110}
111
9fde9401 112cd_to_toplevel () {
5be60078 113 cdup=$(git rev-parse --show-cdup)
9fde9401
JH
114 if test ! -z "$cdup"
115 then
2c3c395e
MC
116 # The "-P" option says to follow "physical" directory
117 # structure instead of following symbolic links. When cdup is
118 # "../", this means following the ".." entry in the current
119 # directory instead textually removing a symlink path element
120 # from the PWD shell variable. The "-P" behavior is more
121 # consistent with the C-style chdir used by most of Git.
122 cd -P "$cdup" || {
123 echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
9fde9401
JH
124 exit 1
125 }
126 fi
127}
128
7eff28a9 129require_work_tree () {
e90fdc39 130 test $(git rev-parse --is-inside-work-tree) = true ||
7eff28a9
SP
131 die "fatal: $0 cannot be used without a working tree."
132}
133
0cae2346
JS
134get_author_ident_from_commit () {
135 pick_author_script='
136 /^author /{
137 s/'\''/'\''\\'\'\''/g
138 h
139 s/^author \([^<]*\) <[^>]*> .*$/\1/
140 s/'\''/'\''\'\'\''/g
141 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
142
143 g
144 s/^author [^<]* <\([^>]*\)> .*$/\1/
145 s/'\''/'\''\'\'\''/g
146 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
147
148 g
149 s/^author [^<]* <[^>]*> \(.*\)$/\1/
150 s/'\''/'\''\'\'\''/g
151 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
152
153 q
154 }
155 '
156 encoding=$(git config i18n.commitencoding || echo UTF-8)
077b725f 157 git show -s --pretty=raw --encoding="$encoding" "$1" -- |
0cae2346
JS
158 LANG=C LC_ALL=C sed -ne "$pick_author_script"
159}
160
22c90717
JH
161# Make sure we are in a valid repository of a vintage we understand,
162# if we require to be in a git repository.
70087cdb 163if test -z "$NONGIT_OK"
d025524d 164then
4d6d6d2d 165 GIT_DIR=$(git rev-parse --git-dir) || exit
22c90717
JH
166 if [ -z "$SUBDIRECTORY_OK" ]
167 then
22c90717
JH
168 test -z "$(git rev-parse --show-cdup)" || {
169 exit=$?
170 echo >&2 "You need to run this command from the toplevel of the working tree."
171 exit $exit
172 }
22c90717
JH
173 fi
174 test -n "$GIT_DIR" && GIT_DIR=$(cd "$GIT_DIR" && pwd) || {
175 echo >&2 "Unable to determine absolute path of git directory"
176 exit 1
b2bc9a30 177 }
22c90717 178 : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"}
d025524d 179fi
87bddba9
JS
180
181# Fix some commands on Windows
182case $(uname -s) in
183*MINGW*)
184 # Windows has its own (incompatible) sort and find
185 sort () {
186 /usr/bin/sort "$@"
187 }
188 find () {
189 /usr/bin/find "$@"
190 }
191 ;;
192esac