Linus Torvalds | a3e870f | 2005-05-30 12:51:00 -0700 | [diff] [blame] | 1 | #!/bin/sh |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 2 | # |
| 3 | # Copyright (c) 2005 Linus Torvalds |
| 4 | # |
| 5 | |
Linus Torvalds | b33e966 | 2005-07-08 10:57:21 -0700 | [diff] [blame] | 6 | . git-sh-setup-script || die "Not a git archive" |
| 7 | |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 8 | usage () { |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 9 | die 'git commit [-a] [-v | --no-verify] [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]' |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 10 | } |
| 11 | |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 12 | all= logfile= use_commit= no_edit= log_given= log_message= verify=t signoff= |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 13 | while case "$#" in 0) break;; esac |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 14 | do |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 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 ;; |
Junio C Hamano | bc4af68 | 2005-08-29 21:25:19 -0700 | [diff] [blame] | 67 | -e|--e|--ed|--edi|--edit) |
| 68 | no_edit= |
| 69 | shift ;; |
Junio C Hamano | 0cfe1d3 | 2005-08-12 23:39:15 -0700 | [diff] [blame] | 70 | -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) |
| 71 | signoff=t |
| 72 | shift ;; |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 73 | -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify) |
| 74 | verify= |
| 75 | shift ;; |
Junio C Hamano | 0cfe1d3 | 2005-08-12 23:39:15 -0700 | [diff] [blame] | 76 | -v|--v|--ve|--ver|--veri|--verif|--verify) |
| 77 | verify=t |
| 78 | shift ;; |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 79 | --) |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 80 | shift |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 81 | break ;; |
| 82 | -*) |
| 83 | usage ;; |
| 84 | *) |
| 85 | break ;; |
| 86 | esac |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 87 | done |
| 88 | |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 89 | case "$log_given" in |
| 90 | tt*) |
| 91 | die "Only one of -c/-C/-F/-m can be used." ;; |
| 92 | esac |
| 93 | |
Junio C Hamano | 6a0049c | 2005-08-17 15:17:03 -0700 | [diff] [blame] | 94 | case "$all,$#" in |
| 95 | t,*) |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 96 | git-diff-files --name-only -z | |
Junio C Hamano | e20ce6a | 2005-08-18 00:59:37 -0700 | [diff] [blame] | 97 | xargs -0 git-update-cache -q --remove -- |
Junio C Hamano | 22cff6a | 2005-08-16 18:08:19 -0700 | [diff] [blame] | 98 | ;; |
Junio C Hamano | 6a0049c | 2005-08-17 15:17:03 -0700 | [diff] [blame] | 99 | ,0) |
| 100 | ;; |
Junio C Hamano | 22cff6a | 2005-08-16 18:08:19 -0700 | [diff] [blame] | 101 | *) |
| 102 | git-diff-files --name-only -z "$@" | |
Junio C Hamano | e20ce6a | 2005-08-18 00:59:37 -0700 | [diff] [blame] | 103 | xargs -0 git-update-cache -q --remove -- |
Junio C Hamano | 22cff6a | 2005-08-16 18:08:19 -0700 | [diff] [blame] | 104 | ;; |
| 105 | esac || exit 1 |
| 106 | git-update-cache -q --refresh || exit 1 |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 107 | |
Junio C Hamano | 0cfe1d3 | 2005-08-12 23:39:15 -0700 | [diff] [blame] | 108 | case "$verify" in |
| 109 | t) |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 110 | if test -x "$GIT_DIR"/hooks/pre-commit |
| 111 | then |
| 112 | "$GIT_DIR"/hooks/pre-commit || exit |
| 113 | fi |
Junio C Hamano | 0cfe1d3 | 2005-08-12 23:39:15 -0700 | [diff] [blame] | 114 | esac |
| 115 | |
Junio C Hamano | aba2da1 | 2005-08-25 18:57:35 -0700 | [diff] [blame] | 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)" |
| 125 | cat |
| 126 | else |
| 127 | cat <"$logfile" |
| 128 | fi |
| 129 | elif test "$use_commit" != "" |
| 130 | then |
| 131 | git-cat-file commit "$use_commit" | sed -e '1,/^$/d' |
Junio C Hamano | 2d56993 | 2005-08-31 17:15:25 -0700 | [diff] [blame^] | 132 | fi | git-stripspace >.editmsg |
| 133 | |
| 134 | case "$signoff" in |
| 135 | t) |
| 136 | git-var GIT_COMMITTER_IDENT | sed -e ' |
| 137 | s/>.*/>/ |
| 138 | s/^/Signed-off-by: / |
| 139 | ' >>.editmsg |
| 140 | ;; |
| 141 | esac |
| 142 | |
| 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 |
Junio C Hamano | aba2da1 | 2005-08-25 18:57:35 -0700 | [diff] [blame] | 151 | |
Linus Torvalds | 96069cf | 2005-06-14 10:20:14 -0700 | [diff] [blame] | 152 | PARENTS="-p HEAD" |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 153 | if [ ! -r "$GIT_DIR/HEAD" ]; then |
Linus Torvalds | 96069cf | 2005-06-14 10:20:14 -0700 | [diff] [blame] | 154 | if [ -z "$(git-ls-files)" ]; then |
| 155 | echo Nothing to commit 1>&2 |
| 156 | exit 1 |
| 157 | fi |
Linus Torvalds | 96069cf | 2005-06-14 10:20:14 -0700 | [diff] [blame] | 158 | PARENTS="" |
| 159 | else |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 160 | if [ -f "$GIT_DIR/MERGE_HEAD" ]; then |
Linus Torvalds | 96069cf | 2005-06-14 10:20:14 -0700 | [diff] [blame] | 161 | PARENTS="-p HEAD -p MERGE_HEAD" |
Junio C Hamano | aba2da1 | 2005-08-25 18:57:35 -0700 | [diff] [blame] | 162 | fi |
| 163 | if test "$use_commit" != "" |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 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 |
Junio C Hamano | 2150cc9 | 2005-08-15 15:37:37 -0700 | [diff] [blame] | 191 | fi |
Linus Torvalds | 96069cf | 2005-06-14 10:20:14 -0700 | [diff] [blame] | 192 | fi |
Junio C Hamano | 2d56993 | 2005-08-31 17:15:25 -0700 | [diff] [blame^] | 193 | git-status-script >>.editmsg |
Johannes Schindelin | eca35ec | 2005-08-05 17:34:38 +0200 | [diff] [blame] | 194 | if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ] |
Linus Torvalds | a3e870f | 2005-05-30 12:51:00 -0700 | [diff] [blame] | 195 | then |
Junio C Hamano | 9804b7d | 2005-08-26 16:53:26 -0700 | [diff] [blame] | 196 | rm -f .editmsg |
| 197 | git-status-script |
Linus Torvalds | a3e870f | 2005-05-30 12:51:00 -0700 | [diff] [blame] | 198 | exit 1 |
| 199 | fi |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 200 | case "$no_edit" in |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 201 | '') |
| 202 | ${VISUAL:-${EDITOR:-vi}} .editmsg |
| 203 | ;; |
| 204 | esac |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 205 | |
| 206 | case "$verify" in |
| 207 | t) |
| 208 | if test -x "$GIT_DIR"/hooks/commit-msg |
| 209 | then |
| 210 | "$GIT_DIR"/hooks/commit-msg .editmsg || exit |
| 211 | fi |
| 212 | esac |
| 213 | |
Linus Torvalds | a3e870f | 2005-05-30 12:51:00 -0700 | [diff] [blame] | 214 | grep -v '^#' < .editmsg | git-stripspace > .cmitmsg |
Junio C Hamano | 0cfe1d3 | 2005-08-12 23:39:15 -0700 | [diff] [blame] | 215 | grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk |
| 216 | if test -s .cmitchk |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 217 | then |
Linus Torvalds | 170241b | 2005-06-19 19:57:01 -0700 | [diff] [blame] | 218 | tree=$(git-write-tree) && |
| 219 | commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) && |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 220 | echo $commit > "$GIT_DIR/HEAD" && |
| 221 | rm -f -- "$GIT_DIR/MERGE_HEAD" |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 222 | else |
| 223 | echo >&2 "* no commit message? aborting commit." |
| 224 | false |
| 225 | fi |
Linus Torvalds | 170241b | 2005-06-19 19:57:01 -0700 | [diff] [blame] | 226 | ret="$?" |
Junio C Hamano | 0cfe1d3 | 2005-08-12 23:39:15 -0700 | [diff] [blame] | 227 | rm -f .cmitmsg .editmsg .cmitchk |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 228 | |
| 229 | if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0 |
| 230 | then |
| 231 | "$GIT_DIR"/hooks/post-commit |
| 232 | fi |
Linus Torvalds | 170241b | 2005-06-19 19:57:01 -0700 | [diff] [blame] | 233 | exit "$ret" |