[PATCH] Make git-checkout failure message more friendly.
[alt-git.git] / git-commit.sh
blobd8bfc3c254929d3fb7a8aa702b4f4a86edefe8f0
1 #!/bin/sh
3 # Copyright (c) 2005 Linus Torvalds
6 . git-sh-setup || die "Not a git archive"
8 usage () {
9 die 'git commit [-a] [-v | --no-verify] [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<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,*)
96 git-diff-files --name-only -z |
97 xargs -0 git-update-index -q --remove --
99 ,0)
102 git-diff-files --name-only -z "$@" |
103 xargs -0 git-update-index -q --remove --
105 esac || exit 1
106 git-update-index -q --refresh || exit 1
108 case "$verify" in
110 if test -x "$GIT_DIR"/hooks/pre-commit
111 then
112 "$GIT_DIR"/hooks/pre-commit || exit
114 esac
116 if test "$log_message" != ''
117 then
118 echo "$log_message"
119 elif test "$logfile" != ""
120 then
121 if test "$logfile" = -
122 then
123 test -t 0 &&
124 echo >&2 "(reading log message from standard input)"
126 else
127 cat <"$logfile"
129 elif test "$use_commit" != ""
130 then
131 git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
132 fi | git-stripspace >.editmsg
134 case "$signoff" in
136 git-var GIT_COMMITTER_IDENT | sed -e '
137 s/>.*/>/
138 s/^/Signed-off-by: /
139 ' >>.editmsg
141 esac
143 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
144 echo "#"
145 echo "# It looks like your may be committing a MERGE."
146 echo "# If this is not correct, please remove the file"
147 echo "# $GIT_DIR/MERGE_HEAD"
148 echo "# and try again"
149 echo "#"
150 fi >>.editmsg
152 PARENTS="-p HEAD"
153 if [ ! -r "$GIT_DIR/HEAD" ]; then
154 if [ -z "$(git-ls-files)" ]; then
155 echo Nothing to commit 1>&2
156 exit 1
158 PARENTS=""
159 else
160 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
161 PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
163 if test "$use_commit" != ""
164 then
165 pick_author_script='
166 /^author /{
168 s/^author \([^<]*\) <[^>]*> .*$/\1/
169 s/'\''/'\''\'\'\''/g
170 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
173 s/^author [^<]* <\([^>]*\)> .*$/\1/
174 s/'\''/'\''\'\'\''/g
175 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
178 s/^author [^<]* <[^>]*> \(.*\)$/\1/
179 s/'\''/'\''\'\'\''/g
180 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
185 set_author_env=`git-cat-file commit "$use_commit" |
186 sed -ne "$pick_author_script"`
187 eval "$set_author_env"
188 export GIT_AUTHOR_NAME
189 export GIT_AUTHOR_EMAIL
190 export GIT_AUTHOR_DATE
193 git-status >>.editmsg
194 if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
195 then
196 rm -f .editmsg
197 git-status
198 exit 1
200 case "$no_edit" in
202 ${VISUAL:-${EDITOR:-vi}} .editmsg
204 esac
206 case "$verify" in
208 if test -x "$GIT_DIR"/hooks/commit-msg
209 then
210 "$GIT_DIR"/hooks/commit-msg .editmsg || exit
212 esac
214 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
215 grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk
216 if test -s .cmitchk
217 then
218 tree=$(git-write-tree) &&
219 commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
220 echo $commit > "$GIT_DIR/HEAD" &&
221 rm -f -- "$GIT_DIR/MERGE_HEAD"
222 else
223 echo >&2 "* no commit message? aborting commit."
224 false
226 ret="$?"
227 rm -f .cmitmsg .editmsg .cmitchk
229 if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
230 then
231 "$GIT_DIR"/hooks/post-commit
233 exit "$ret"