Use GIT_EXEC_PATH explicitly for initial git-init-db in tests.
[git/dscho.git] / git-commit.sh
blob3d250ec853dad3ff7e714025026ca90f2c77e7bb
1 #!/bin/sh
3 # Copyright (c) 2005 Linus Torvalds
6 . git-sh-setup
8 usage () {
9 die 'git commit [-a] [-s] [-v | --no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [<path>...]'
12 all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
13 while case "$#" in 0) break;; esac
15 case "$1" in
16 -a|--a|--al|--all)
17 all=t
18 shift ;;
19 -F=*|--f=*|--fi=*|--fil=*|--file=*)
20 log_given=t$log_given
21 logfile=`expr "$1" : '-[^=]*=\(.*\)'`
22 no_edit=t
23 shift ;;
24 -F|--f|--fi|--fil|--file)
25 case "$#" in 1) usage ;; esac; shift
26 log_given=t$log_given
27 logfile="$1"
28 no_edit=t
29 shift ;;
30 -m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
31 log_given=t$log_given
32 log_message=`expr "$1" : '-[^=]*=\(.*\)'`
33 no_edit=t
34 shift ;;
35 -m|--m|--me|--mes|--mess|--messa|--messag|--message)
36 case "$#" in 1) usage ;; esac; shift
37 log_given=t$log_given
38 log_message="$1"
39 no_edit=t
40 shift ;;
41 -c=*|--ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
42 --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
43 --reedit-messag=*|--reedit-message=*)
44 log_given=t$log_given
45 use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
46 shift ;;
47 -c|--ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
48 --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)
49 case "$#" in 1) usage ;; esac; shift
50 log_given=t$log_given
51 use_commit="$1"
52 shift ;;
53 -C=*|--reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
54 --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
55 --reuse-message=*)
56 log_given=t$log_given
57 use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
58 no_edit=t
59 shift ;;
60 -C|--reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
61 --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
62 case "$#" in 1) usage ;; esac; shift
63 log_given=t$log_given
64 use_commit="$1"
65 no_edit=t
66 shift ;;
67 -e|--e|--ed|--edi|--edit)
68 no_edit=
69 shift ;;
70 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
71 signoff=t
72 shift ;;
73 -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
74 verify=
75 shift ;;
76 -v|--v|--ve|--ver|--veri|--verif|--verify)
77 verify=t
78 shift ;;
79 --)
80 shift
81 break ;;
82 -*)
83 usage ;;
85 break ;;
86 esac
87 done
89 case "$log_given" in
90 tt*)
91 die "Only one of -c/-C/-F/-m can be used." ;;
92 esac
94 case "$all,$#" in
95 t,0)
96 git-diff-files --name-only -z |
97 git-update-index --remove -z --stdin
99 t,*)
100 die "Cannot use -a and explicit files at the same time."
105 git-diff-files --name-only -z -- "$@" |
106 git-update-index --remove -z --stdin
108 esac || exit 1
109 git-update-index -q --refresh || exit 1
111 case "$verify" in
113 if test -x "$GIT_DIR"/hooks/pre-commit
114 then
115 "$GIT_DIR"/hooks/pre-commit || exit
117 esac
119 if test "$log_message" != ''
120 then
121 echo "$log_message"
122 elif test "$logfile" != ""
123 then
124 if test "$logfile" = -
125 then
126 test -t 0 &&
127 echo >&2 "(reading log message from standard input)"
129 else
130 cat <"$logfile"
132 elif test "$use_commit" != ""
133 then
134 git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
135 elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
136 then
137 cat "$GIT_DIR/MERGE_MSG"
138 fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
140 case "$signoff" in
143 echo
144 git-var GIT_COMMITTER_IDENT | sed -e '
145 s/>.*/>/
146 s/^/Signed-off-by: /
148 } >>"$GIT_DIR"/COMMIT_EDITMSG
150 esac
152 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
153 echo "#"
154 echo "# It looks like your may be committing a MERGE."
155 echo "# If this is not correct, please remove the file"
156 echo "# $GIT_DIR/MERGE_HEAD"
157 echo "# and try again"
158 echo "#"
159 fi >>"$GIT_DIR"/COMMIT_EDITMSG
161 PARENTS="-p HEAD"
162 if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1
163 then
164 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
165 PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
167 if test "$use_commit" != ""
168 then
169 pick_author_script='
170 /^author /{
172 s/^author \([^<]*\) <[^>]*> .*$/\1/
173 s/'\''/'\''\'\'\''/g
174 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
177 s/^author [^<]* <\([^>]*\)> .*$/\1/
178 s/'\''/'\''\'\'\''/g
179 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
182 s/^author [^<]* <[^>]*> \(.*\)$/\1/
183 s/'\''/'\''\'\'\''/g
184 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
189 set_author_env=`git-cat-file commit "$use_commit" |
190 LANG=C LC_ALL=C sed -ne "$pick_author_script"`
191 eval "$set_author_env"
192 export GIT_AUTHOR_NAME
193 export GIT_AUTHOR_EMAIL
194 export GIT_AUTHOR_DATE
196 else
197 if [ -z "$(git-ls-files)" ]; then
198 echo Nothing to commit 1>&2
199 exit 1
201 PARENTS=""
203 git-status >>"$GIT_DIR"/COMMIT_EDITMSG
204 if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
205 then
206 rm -f "$GIT_DIR/COMMIT_EDITMSG"
207 git-status
208 exit 1
210 case "$no_edit" in
212 ${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
214 esac
216 case "$verify" in
218 if test -x "$GIT_DIR"/hooks/commit-msg
219 then
220 "$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
222 esac
224 grep -v '^#' < "$GIT_DIR"/COMMIT_EDITMSG |
225 git-stripspace > "$GIT_DIR"/COMMIT_MSG
227 if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
228 git-stripspace |
229 wc -l` &&
230 test 0 -lt $cnt
231 then
232 tree=$(git-write-tree) &&
233 commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
234 git-update-ref HEAD $commit $current &&
235 rm -f -- "$GIT_DIR/MERGE_HEAD"
236 else
237 echo >&2 "* no commit message? aborting commit."
238 false
240 ret="$?"
241 rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
243 if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
244 then
245 "$GIT_DIR"/hooks/post-commit
247 exit "$ret"