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