]> git.ipfire.org Git - thirdparty/git.git/blame - git-commit.sh
[PATCH] Make the test more shell generic and fix missing Solaris find option
[thirdparty/git.git] / git-commit.sh
CommitLineData
a3e870f2 1#!/bin/sh
5fec3ef1
JH
2#
3# Copyright (c) 2005 Linus Torvalds
4#
5
215a7ad1 6. git-sh-setup || die "Not a git archive"
b33e9666 7
5fec3ef1 8usage () {
89e2c5f1 9 die 'git commit [-a] [-v | --no-verify] [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
5fec3ef1
JH
10}
11
89e2c5f1 12all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff=
0c091296 13while case "$#" in 0) break;; esac
5fec3ef1 14do
0c091296
JH
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 ;;
bc4af68a
JH
67 -e|--e|--ed|--edi|--edit)
68 no_edit=
69 shift ;;
0cfe1d30
JH
70 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
71 signoff=t
72 shift ;;
89e2c5f1
JH
73 -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
74 verify=
75 shift ;;
0cfe1d30
JH
76 -v|--v|--ve|--ver|--veri|--verif|--verify)
77 verify=t
78 shift ;;
0c091296 79 --)
5fec3ef1 80 shift
0c091296
JH
81 break ;;
82 -*)
83 usage ;;
84 *)
85 break ;;
86 esac
5fec3ef1
JH
87done
88
0c091296
JH
89case "$log_given" in
90tt*)
91 die "Only one of -c/-C/-F/-m can be used." ;;
92esac
93
6a0049c0
JH
94case "$all,$#" in
95t,*)
0c091296 96 git-diff-files --name-only -z |
215a7ad1 97 xargs -0 git-update-index -q --remove --
22cff6a5 98 ;;
6a0049c0
JH
99,0)
100 ;;
22cff6a5
JH
101*)
102 git-diff-files --name-only -z "$@" |
215a7ad1 103 xargs -0 git-update-index -q --remove --
22cff6a5
JH
104 ;;
105esac || exit 1
215a7ad1 106git-update-index -q --refresh || exit 1
0c091296 107
0cfe1d30
JH
108case "$verify" in
109t)
89e2c5f1
JH
110 if test -x "$GIT_DIR"/hooks/pre-commit
111 then
112 "$GIT_DIR"/hooks/pre-commit || exit
113 fi
0cfe1d30
JH
114esac
115
aba2da13
JH
116if test "$log_message" != ''
117then
118 echo "$log_message"
119elif test "$logfile" != ""
120then
121 if test "$logfile" = -
122 then
123 test -t 0 &&
124 echo >&2 "(reading log message from standard input)"
125 cat
126 else
127 cat <"$logfile"
128 fi
129elif test "$use_commit" != ""
130then
131 git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
2d569933
JH
132fi | git-stripspace >.editmsg
133
134case "$signoff" in
135t)
136 git-var GIT_COMMITTER_IDENT | sed -e '
137 s/>.*/>/
138 s/^/Signed-off-by: /
139 ' >>.editmsg
140 ;;
141esac
142
143if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
deca7e8c
JH
144
145 test -f "$GIT_DIR/MERGE_MSG" && cat "$GIT_DIR/MERGE_MSG"
146
2d569933
JH
147 echo "#"
148 echo "# It looks like your may be committing a MERGE."
149 echo "# If this is not correct, please remove the file"
150 echo "# $GIT_DIR/MERGE_HEAD"
151 echo "# and try again"
152 echo "#"
153fi >>.editmsg
aba2da13 154
96069cf0 155PARENTS="-p HEAD"
5fec3ef1 156if [ ! -r "$GIT_DIR/HEAD" ]; then
96069cf0
LT
157 if [ -z "$(git-ls-files)" ]; then
158 echo Nothing to commit 1>&2
159 exit 1
160 fi
96069cf0
LT
161 PARENTS=""
162else
5fec3ef1 163 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
91063bbc 164 PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
aba2da13
JH
165 fi
166 if test "$use_commit" != ""
5fec3ef1
JH
167 then
168 pick_author_script='
169 /^author /{
170 h
171 s/^author \([^<]*\) <[^>]*> .*$/\1/
172 s/'\''/'\''\'\'\''/g
173 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
174
175 g
176 s/^author [^<]* <\([^>]*\)> .*$/\1/
177 s/'\''/'\''\'\'\''/g
178 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
179
180 g
181 s/^author [^<]* <[^>]*> \(.*\)$/\1/
182 s/'\''/'\''\'\'\''/g
183 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
184
185 q
186 }
187 '
188 set_author_env=`git-cat-file commit "$use_commit" |
189 sed -ne "$pick_author_script"`
190 eval "$set_author_env"
191 export GIT_AUTHOR_NAME
192 export GIT_AUTHOR_EMAIL
193 export GIT_AUTHOR_DATE
2150cc99 194 fi
96069cf0 195fi
215a7ad1 196git-status >>.editmsg
eca35ecd 197if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
a3e870f2 198then
9804b7dc 199 rm -f .editmsg
215a7ad1 200 git-status
a3e870f2
LT
201 exit 1
202fi
0c091296 203case "$no_edit" in
5fec3ef1
JH
204'')
205 ${VISUAL:-${EDITOR:-vi}} .editmsg
206 ;;
207esac
89e2c5f1
JH
208
209case "$verify" in
210t)
211 if test -x "$GIT_DIR"/hooks/commit-msg
212 then
213 "$GIT_DIR"/hooks/commit-msg .editmsg || exit
214 fi
215esac
216
a3e870f2 217grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
0cfe1d30
JH
218grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk
219if test -s .cmitchk
0c091296 220then
170241b7
LT
221 tree=$(git-write-tree) &&
222 commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
5fec3ef1
JH
223 echo $commit > "$GIT_DIR/HEAD" &&
224 rm -f -- "$GIT_DIR/MERGE_HEAD"
0c091296
JH
225else
226 echo >&2 "* no commit message? aborting commit."
227 false
228fi
170241b7 229ret="$?"
0cfe1d30 230rm -f .cmitmsg .editmsg .cmitchk
89e2c5f1
JH
231
232if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
233then
234 "$GIT_DIR"/hooks/post-commit
235fi
170241b7 236exit "$ret"