[PATCH] cvsgit fixes: spaces in filenames and CVS server dialog woes
[git/dscho.git] / git-commit-script
blob790f07c08fc3aa893485fa3d252ce1fcb951d0fe
1 #!/bin/sh
3 # Copyright (c) 2005 Linus Torvalds
6 . git-sh-setup-script || die "Not a git archive"
8 usage () {
9 die 'git commit [-a] [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
12 all= logfile= use_commit= no_edit= log_given= log_message= verify= 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 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
68 signoff=t
69 shift ;;
70 -v|--v|--ve|--ver|--veri|--verif|--verify)
71 verify=t
72 shift ;;
73 --)
74 shift
75 break ;;
76 -*)
77 usage ;;
79 break ;;
80 esac
81 done
83 case "$log_given" in
84 tt*)
85 die "Only one of -c/-C/-F/-m can be used." ;;
86 esac
88 case "$all" in
90 git-diff-files --name-only -z |
91 xargs -0 git-update-cache -q -- || exit 1 ;;
92 esac
93 git-update-cache -q --refresh -- "$@" || exit 1
95 case "$verify" in
97 # This is slightly modified from Andrew Morton's Perfect Patch.
98 # Lines you introduce should not have trailing whitespace.
99 # Also check for an indentation that has SP before a TAB.
100 perl -e '
101 my $fh;
102 my $found_bad = 0;
103 my $filename;
104 my $reported_filename = "";
105 my $lineno;
106 sub bad_line {
107 my ($why, $line) = @_;
108 if (!$found_bad) {
109 print "*\n";
110 print "* You have some suspicious patch lines:\n";
111 print "*\n";
112 $found_bad = 1;
114 if ($reported_filename ne $filename) {
115 print "* In $filename\n";
116 $reported_filename = $filename;
118 print "* $why (line $lineno)\n$line\n";
120 open $fh, "-|", qw(git-diff-cache -p -M --cached HEAD);
121 while (<$fh>) {
122 if (m|^diff --git a/(.*) b/\1$|) {
123 $filename = $1;
124 next;
126 if (/^@@ -\S+ \+(\d+)/) {
127 $lineno = $1 - 1;
128 next;
130 if (/^ /) {
131 $lineno++;
132 next;
134 if (s/^\+//) {
135 $lineno++;
136 chomp;
137 if (/\s$/) {
138 bad_line("trailing whitespace", $_);
140 if (/^\s* /) {
141 bad_line("indent SP followed by a TAB", $_);
145 exit($found_bad);
146 ' || exit ;;
147 esac
149 PARENTS="-p HEAD"
150 if [ ! -r "$GIT_DIR/HEAD" ]; then
151 if [ -z "$(git-ls-files)" ]; then
152 echo Nothing to commit 1>&2
153 exit 1
156 echo "#"
157 echo "# Initial commit"
158 case "$no_edit" in
159 t) echo "# (ignoring your commit message for initial commit)"
160 no_edit=
161 esac
162 echo "#"
163 git-ls-files | sed 's/^/# New file: /'
164 echo "#"
165 } >.editmsg
166 PARENTS=""
167 no_edit=
168 else
169 if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
171 echo "#"
172 echo "# It looks like your may be committing a MERGE."
173 echo "# If this is not correct, please remove the file"
174 echo "# $GIT_DIR/MERGE_HEAD"
175 echo "# and try again"
176 case "$no_edit" in
177 t) echo "# (ignoring your commit message for merge commit)"
178 no_edit=
179 esac
180 echo "#"
182 git-stripspace >.editmsg
183 PARENTS="-p HEAD -p MERGE_HEAD"
184 elif test "$log_message" != ''
185 then
186 echo "$log_message" |
187 git-stripspace >.editmsg
188 elif test "$logfile" != ""
189 then
190 if test "$logfile" = -
191 then
192 test -t 0 &&
193 echo >&2 "(reading log message from standard input)"
195 else
196 cat <"$logfile"
197 fi |
198 git-stripspace >.editmsg
199 elif test "$use_commit" != ""
200 then
201 pick_author_script='
202 /^author /{
204 s/^author \([^<]*\) <[^>]*> .*$/\1/
205 s/'\''/'\''\'\'\''/g
206 s/.*/GIT_AUTHOR_NAME='\''&'\''/p
209 s/^author [^<]* <\([^>]*\)> .*$/\1/
210 s/'\''/'\''\'\'\''/g
211 s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
214 s/^author [^<]* <[^>]*> \(.*\)$/\1/
215 s/'\''/'\''\'\'\''/g
216 s/.*/GIT_AUTHOR_DATE='\''&'\''/p
221 set_author_env=`git-cat-file commit "$use_commit" |
222 sed -ne "$pick_author_script"`
223 eval "$set_author_env"
224 export GIT_AUTHOR_NAME
225 export GIT_AUTHOR_EMAIL
226 export GIT_AUTHOR_DATE
227 git-cat-file commit "$use_commit" |
228 sed -e '1,/^$/d' |
229 git-stripspace >.editmsg
232 case "$signoff" in
234 git-var GIT_COMMITTER_IDENT | sed -e '
235 s/>.*/>/
236 s/^/Signed-off-by: /' >>.editmsg ;;
237 esac
238 git-status-script >>.editmsg
240 if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
241 then
242 cat .editmsg
243 rm .editmsg
244 exit 1
246 case "$no_edit" in
248 ${VISUAL:-${EDITOR:-vi}} .editmsg
250 esac
251 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
252 grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk
253 if test -s .cmitchk
254 then
255 tree=$(git-write-tree) &&
256 commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
257 echo $commit > "$GIT_DIR/HEAD" &&
258 rm -f -- "$GIT_DIR/MERGE_HEAD"
259 else
260 echo >&2 "* no commit message? aborting commit."
261 false
263 ret="$?"
264 rm -f .cmitmsg .editmsg .cmitchk
265 exit "$ret"