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 |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 4 | # Copyright (c) 2006 Junio C Hamano |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 5 | |
Steven Grimm | d1cc130 | 2007-07-22 21:17:42 -0700 | [diff] [blame] | 6 | USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [--template <file>] [[-i | -o] <path>...]' |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 7 | SUBDIRECTORY_OK=Yes |
Junio C Hamano | ae2b0f1 | 2005-11-24 00:12:11 -0800 | [diff] [blame] | 8 | . git-sh-setup |
Shawn O. Pearce | 7eff28a | 2006-12-30 23:32:38 -0500 | [diff] [blame] | 9 | require_work_tree |
Linus Torvalds | b33e966 | 2005-07-08 10:57:21 -0700 | [diff] [blame] | 10 | |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 11 | git rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 12 | |
| 13 | case "$0" in |
| 14 | *status) |
| 15 | status_only=t |
Junio C Hamano | 2b5f9a8 | 2007-02-22 00:28:49 -0800 | [diff] [blame] | 16 | ;; |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 17 | *commit) |
| 18 | status_only= |
Junio C Hamano | 2b5f9a8 | 2007-02-22 00:28:49 -0800 | [diff] [blame] | 19 | ;; |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 20 | esac |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 21 | |
| 22 | refuse_partial () { |
| 23 | echo >&2 "$1" |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 24 | echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?" |
| 25 | exit 1 |
| 26 | } |
| 27 | |
Junio C Hamano | c8f2032 | 2007-10-02 11:47:58 -0700 | [diff] [blame] | 28 | TMP_INDEX= |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 29 | THIS_INDEX="$GIT_DIR/index" |
| 30 | NEXT_INDEX="$GIT_DIR/next-index$$" |
| 31 | rm -f "$NEXT_INDEX" |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 32 | save_index () { |
Junio C Hamano | cc7d5bc | 2006-06-29 14:48:22 -0700 | [diff] [blame] | 33 | cp -p "$THIS_INDEX" "$NEXT_INDEX" |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 34 | } |
| 35 | |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 36 | run_status () { |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 37 | # If TMP_INDEX is defined, that means we are doing |
| 38 | # "--only" partial commit, and that index file is used |
| 39 | # to build the tree for the commit. Otherwise, if |
| 40 | # NEXT_INDEX exists, that is the index file used to |
| 41 | # make the commit. Otherwise we are using as-is commit |
| 42 | # so the regular index file is what we use to compare. |
| 43 | if test '' != "$TMP_INDEX" |
| 44 | then |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 45 | GIT_INDEX_FILE="$TMP_INDEX" |
| 46 | export GIT_INDEX_FILE |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 47 | elif test -f "$NEXT_INDEX" |
| 48 | then |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 49 | GIT_INDEX_FILE="$NEXT_INDEX" |
| 50 | export GIT_INDEX_FILE |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 51 | fi |
| 52 | |
Brian Hetro | 09b0d9d | 2007-08-26 14:35:26 -0400 | [diff] [blame] | 53 | if test "$status_only" = "t" -o "$use_status_color" = "t"; then |
| 54 | color= |
| 55 | else |
| 56 | color=--nocolor |
| 57 | fi |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 58 | git runstatus ${color} \ |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 59 | ${verbose:+--verbose} \ |
| 60 | ${amend:+--amend} \ |
Johannes Schindelin | 2074cb0 | 2006-09-12 22:45:12 +0200 | [diff] [blame] | 61 | ${untracked_files:+--untracked} |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 62 | } |
| 63 | |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 64 | trap ' |
| 65 | test -z "$TMP_INDEX" || { |
| 66 | test -f "$TMP_INDEX" && rm -f "$TMP_INDEX" |
| 67 | } |
| 68 | rm -f "$NEXT_INDEX" |
| 69 | ' 0 |
| 70 | |
| 71 | ################################################################ |
| 72 | # Command line argument parsing and sanity checking |
| 73 | |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 74 | all= |
| 75 | also= |
Paolo Bonzini | 6cbf07e | 2007-03-05 08:57:53 +0100 | [diff] [blame] | 76 | interactive= |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 77 | only= |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 78 | logfile= |
| 79 | use_commit= |
Junio C Hamano | b4019f0 | 2006-03-02 21:04:05 -0800 | [diff] [blame] | 80 | amend= |
Jeff King | cda8ab5 | 2006-06-23 09:43:38 -0400 | [diff] [blame] | 81 | edit_flag= |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 82 | no_edit= |
| 83 | log_given= |
| 84 | log_message= |
| 85 | verify=t |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 86 | quiet= |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 87 | verbose= |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 88 | signoff= |
| 89 | force_author= |
Junio C Hamano | bba319b | 2006-02-14 12:40:20 -0800 | [diff] [blame] | 90 | only_include_assumed= |
Matthias Lederhofer | 443f833 | 2006-05-22 23:02:06 +0200 | [diff] [blame] | 91 | untracked_files= |
Steven Grimm | d1cc130 | 2007-07-22 21:17:42 -0700 | [diff] [blame] | 92 | templatefile="`git config commit.template`" |
David Kastrup | 822f7c7 | 2007-09-23 22:42:08 +0200 | [diff] [blame] | 93 | while test $# != 0 |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 94 | do |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 95 | case "$1" in |
| 96 | -F|--F|-f|--f|--fi|--fil|--file) |
| 97 | case "$#" in 1) usage ;; esac |
| 98 | shift |
| 99 | no_edit=t |
| 100 | log_given=t$log_given |
| 101 | logfile="$1" |
| 102 | shift |
| 103 | ;; |
| 104 | -F*|-f*) |
| 105 | no_edit=t |
| 106 | log_given=t$log_given |
| 107 | logfile=`expr "z$1" : 'z-[Ff]\(.*\)'` |
| 108 | shift |
| 109 | ;; |
| 110 | --F=*|--f=*|--fi=*|--fil=*|--file=*) |
| 111 | no_edit=t |
| 112 | log_given=t$log_given |
| 113 | logfile=`expr "z$1" : 'z-[^=]*=\(.*\)'` |
| 114 | shift |
| 115 | ;; |
| 116 | -a|--a|--al|--all) |
| 117 | all=t |
| 118 | shift |
| 119 | ;; |
| 120 | --au=*|--aut=*|--auth=*|--autho=*|--author=*) |
| 121 | force_author=`expr "z$1" : 'z-[^=]*=\(.*\)'` |
| 122 | shift |
| 123 | ;; |
| 124 | --au|--aut|--auth|--autho|--author) |
| 125 | case "$#" in 1) usage ;; esac |
| 126 | shift |
| 127 | force_author="$1" |
| 128 | shift |
| 129 | ;; |
| 130 | -e|--e|--ed|--edi|--edit) |
| 131 | edit_flag=t |
| 132 | shift |
| 133 | ;; |
| 134 | -i|--i|--in|--inc|--incl|--inclu|--includ|--include) |
| 135 | also=t |
| 136 | shift |
| 137 | ;; |
Paolo Bonzini | 6cbf07e | 2007-03-05 08:57:53 +0100 | [diff] [blame] | 138 | --int|--inte|--inter|--intera|--interac|--interact|--interacti|\ |
| 139 | --interactiv|--interactive) |
| 140 | interactive=t |
| 141 | shift |
| 142 | ;; |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 143 | -o|--o|--on|--onl|--only) |
| 144 | only=t |
| 145 | shift |
| 146 | ;; |
| 147 | -m|--m|--me|--mes|--mess|--messa|--messag|--message) |
| 148 | case "$#" in 1) usage ;; esac |
| 149 | shift |
| 150 | log_given=m$log_given |
| 151 | if test "$log_message" = '' |
| 152 | then |
| 153 | log_message="$1" |
| 154 | else |
| 155 | log_message="$log_message |
Shawn Pearce | 6891281 | 2006-05-29 04:45:49 -0400 | [diff] [blame] | 156 | |
| 157 | $1" |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 158 | fi |
| 159 | no_edit=t |
| 160 | shift |
| 161 | ;; |
| 162 | -m*) |
| 163 | log_given=m$log_given |
| 164 | if test "$log_message" = '' |
| 165 | then |
| 166 | log_message=`expr "z$1" : 'z-m\(.*\)'` |
| 167 | else |
| 168 | log_message="$log_message |
Shawn Pearce | 6891281 | 2006-05-29 04:45:49 -0400 | [diff] [blame] | 169 | |
Dennis Stosberg | 8096fae | 2006-06-27 18:54:26 +0200 | [diff] [blame] | 170 | `expr "z$1" : 'z-m\(.*\)'`" |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 171 | fi |
| 172 | no_edit=t |
| 173 | shift |
| 174 | ;; |
| 175 | --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*) |
| 176 | log_given=m$log_given |
| 177 | if test "$log_message" = '' |
| 178 | then |
| 179 | log_message=`expr "z$1" : 'z-[^=]*=\(.*\)'` |
| 180 | else |
| 181 | log_message="$log_message |
Shawn Pearce | 6891281 | 2006-05-29 04:45:49 -0400 | [diff] [blame] | 182 | |
Dennis Stosberg | 8096fae | 2006-06-27 18:54:26 +0200 | [diff] [blame] | 183 | `expr "z$1" : 'zq-[^=]*=\(.*\)'`" |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 184 | fi |
| 185 | no_edit=t |
| 186 | shift |
| 187 | ;; |
| 188 | -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|\ |
| 189 | --no-verify) |
| 190 | verify= |
| 191 | shift |
| 192 | ;; |
| 193 | --a|--am|--ame|--amen|--amend) |
| 194 | amend=t |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 195 | use_commit=HEAD |
| 196 | shift |
| 197 | ;; |
| 198 | -c) |
| 199 | case "$#" in 1) usage ;; esac |
| 200 | shift |
| 201 | log_given=t$log_given |
| 202 | use_commit="$1" |
| 203 | no_edit= |
| 204 | shift |
| 205 | ;; |
| 206 | --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\ |
| 207 | --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\ |
| 208 | --reedit-messag=*|--reedit-message=*) |
| 209 | log_given=t$log_given |
| 210 | use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'` |
| 211 | no_edit= |
| 212 | shift |
| 213 | ;; |
| 214 | --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\ |
| 215 | --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|\ |
| 216 | --reedit-message) |
| 217 | case "$#" in 1) usage ;; esac |
| 218 | shift |
| 219 | log_given=t$log_given |
| 220 | use_commit="$1" |
| 221 | no_edit= |
| 222 | shift |
| 223 | ;; |
| 224 | -C) |
| 225 | case "$#" in 1) usage ;; esac |
| 226 | shift |
| 227 | log_given=t$log_given |
| 228 | use_commit="$1" |
| 229 | no_edit=t |
| 230 | shift |
| 231 | ;; |
| 232 | --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\ |
| 233 | --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\ |
| 234 | --reuse-message=*) |
| 235 | log_given=t$log_given |
| 236 | use_commit=`expr "z$1" : 'z-[^=]*=\(.*\)'` |
| 237 | no_edit=t |
| 238 | shift |
| 239 | ;; |
| 240 | --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\ |
| 241 | --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message) |
| 242 | case "$#" in 1) usage ;; esac |
| 243 | shift |
| 244 | log_given=t$log_given |
| 245 | use_commit="$1" |
| 246 | no_edit=t |
| 247 | shift |
| 248 | ;; |
| 249 | -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) |
| 250 | signoff=t |
| 251 | shift |
| 252 | ;; |
Steven Grimm | d1cc130 | 2007-07-22 21:17:42 -0700 | [diff] [blame] | 253 | -t|--t|--te|--tem|--temp|--templ|--templa|--templat|--template) |
| 254 | case "$#" in 1) usage ;; esac |
| 255 | shift |
| 256 | templatefile="$1" |
| 257 | no_edit= |
| 258 | shift |
| 259 | ;; |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 260 | -q|--q|--qu|--qui|--quie|--quiet) |
| 261 | quiet=t |
| 262 | shift |
| 263 | ;; |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 264 | -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) |
| 265 | verbose=t |
| 266 | shift |
| 267 | ;; |
| 268 | -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|\ |
| 269 | --untracked|--untracked-|--untracked-f|--untracked-fi|--untracked-fil|\ |
| 270 | --untracked-file|--untracked-files) |
| 271 | untracked_files=t |
| 272 | shift |
| 273 | ;; |
| 274 | --) |
| 275 | shift |
| 276 | break |
| 277 | ;; |
| 278 | -*) |
| 279 | usage |
| 280 | ;; |
| 281 | *) |
| 282 | break |
| 283 | ;; |
| 284 | esac |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 285 | done |
Jeff King | cda8ab5 | 2006-06-23 09:43:38 -0400 | [diff] [blame] | 286 | case "$edit_flag" in t) no_edit= ;; esac |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 287 | |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 288 | ################################################################ |
| 289 | # Sanity check options |
| 290 | |
Junio C Hamano | b4019f0 | 2006-03-02 21:04:05 -0800 | [diff] [blame] | 291 | case "$amend,$initial_commit" in |
| 292 | t,t) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 293 | die "You do not have anything to amend." ;; |
Junio C Hamano | b4019f0 | 2006-03-02 21:04:05 -0800 | [diff] [blame] | 294 | t,) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 295 | if [ -f "$GIT_DIR/MERGE_HEAD" ]; then |
| 296 | die "You are in the middle of a merge -- cannot amend." |
| 297 | fi ;; |
Junio C Hamano | b4019f0 | 2006-03-02 21:04:05 -0800 | [diff] [blame] | 298 | esac |
| 299 | |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 300 | case "$log_given" in |
| 301 | tt*) |
Junio C Hamano | 6d4bbeb | 2007-08-01 18:14:41 -0700 | [diff] [blame] | 302 | die "Only one of -c/-C/-F can be used." ;; |
Shawn Pearce | 6891281 | 2006-05-29 04:45:49 -0400 | [diff] [blame] | 303 | *tm*|*mt*) |
Junio C Hamano | 6d4bbeb | 2007-08-01 18:14:41 -0700 | [diff] [blame] | 304 | die "Option -m cannot be combined with -c/-C/-F." ;; |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 305 | esac |
| 306 | |
Junio C Hamano | 6a74642 | 2006-04-20 01:20:56 -0700 | [diff] [blame] | 307 | case "$#,$also,$only,$amend" in |
| 308 | *,t,t,*) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 309 | die "Only one of --include/--only can be used." ;; |
Junio C Hamano | 6a74642 | 2006-04-20 01:20:56 -0700 | [diff] [blame] | 310 | 0,t,,* | 0,,t,) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 311 | die "No paths with --include/--only does not make sense." ;; |
Junio C Hamano | 6a74642 | 2006-04-20 01:20:56 -0700 | [diff] [blame] | 312 | 0,,t,t) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 313 | only_include_assumed="# Clever... amending the last one with dirty index." ;; |
Junio C Hamano | 6a74642 | 2006-04-20 01:20:56 -0700 | [diff] [blame] | 314 | 0,,,*) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 315 | ;; |
Junio C Hamano | 6a74642 | 2006-04-20 01:20:56 -0700 | [diff] [blame] | 316 | *,,,*) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 317 | only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..." |
| 318 | also= |
| 319 | ;; |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 320 | esac |
| 321 | unset only |
Paolo Bonzini | 6cbf07e | 2007-03-05 08:57:53 +0100 | [diff] [blame] | 322 | case "$all,$interactive,$also,$#" in |
| 323 | *t,*t,*) |
| 324 | die "Cannot use -a, --interactive or -i at the same time." ;; |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 325 | t,,[1-9]*) |
| 326 | die "Paths with -a does not make sense." ;; |
Paolo Bonzini | 6cbf07e | 2007-03-05 08:57:53 +0100 | [diff] [blame] | 327 | ,t,[1-9]*) |
| 328 | die "Paths with --interactive does not make sense." ;; |
| 329 | ,,t,0) |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 330 | die "No paths with -i does not make sense." ;; |
| 331 | esac |
| 332 | |
Steven Grimm | d1cc130 | 2007-07-22 21:17:42 -0700 | [diff] [blame] | 333 | if test ! -z "$templatefile" -a -z "$log_given" |
| 334 | then |
| 335 | if test ! -f "$templatefile" |
| 336 | then |
| 337 | die "Commit template file does not exist." |
| 338 | fi |
| 339 | fi |
| 340 | |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 341 | ################################################################ |
| 342 | # Prepare index to have a tree to be committed |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 343 | |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 344 | case "$all,$also" in |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 345 | t,) |
Fredrik Kuivinen | 755b99d | 2007-02-22 21:28:12 +0100 | [diff] [blame] | 346 | if test ! -f "$THIS_INDEX" |
| 347 | then |
| 348 | die 'nothing to commit (use "git add file1 file2" to include for commit)' |
| 349 | fi |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 350 | save_index && |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 351 | ( |
Junio C Hamano | 514c09f | 2007-01-12 12:49:05 -0800 | [diff] [blame] | 352 | cd_to_toplevel && |
| 353 | GIT_INDEX_FILE="$NEXT_INDEX" && |
| 354 | export GIT_INDEX_FILE && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 355 | git diff-files --name-only -z | |
| 356 | git update-index --remove -z --stdin |
Junio C Hamano | 514c09f | 2007-01-12 12:49:05 -0800 | [diff] [blame] | 357 | ) || exit |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 358 | ;; |
| 359 | ,t) |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 360 | save_index && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 361 | git ls-files --error-unmatch -- "$@" >/dev/null || exit |
Junio C Hamano | bba319b | 2006-02-14 12:40:20 -0800 | [diff] [blame] | 362 | |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 363 | git diff-files --name-only -z -- "$@" | |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 364 | ( |
Junio C Hamano | 514c09f | 2007-01-12 12:49:05 -0800 | [diff] [blame] | 365 | cd_to_toplevel && |
| 366 | GIT_INDEX_FILE="$NEXT_INDEX" && |
| 367 | export GIT_INDEX_FILE && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 368 | git update-index --remove -z --stdin |
Junio C Hamano | 514c09f | 2007-01-12 12:49:05 -0800 | [diff] [blame] | 369 | ) || exit |
Junio C Hamano | 22cff6a | 2005-08-16 18:08:19 -0700 | [diff] [blame] | 370 | ;; |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 371 | ,) |
Paolo Bonzini | 6cbf07e | 2007-03-05 08:57:53 +0100 | [diff] [blame] | 372 | if test "$interactive" = t; then |
| 373 | git add --interactive || exit |
| 374 | fi |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 375 | case "$#" in |
| 376 | 0) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 377 | ;; # commit as-is |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 378 | *) |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 379 | if test -f "$GIT_DIR/MERGE_HEAD" |
| 380 | then |
| 381 | refuse_partial "Cannot do a partial commit during a merge." |
| 382 | fi |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 383 | |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 384 | TMP_INDEX="$GIT_DIR/tmp-index$$" |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 385 | W= |
| 386 | test -z "$initial_commit" && W=--with-tree=HEAD |
| 387 | commit_only=`git ls-files --error-unmatch $W -- "$@"` || exit |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 388 | |
Junio C Hamano | 158d057 | 2006-12-09 22:32:43 -0800 | [diff] [blame] | 389 | # Build a temporary index and update the real index |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 390 | # the same way. |
| 391 | if test -z "$initial_commit" |
| 392 | then |
Junio C Hamano | 5e7f56a | 2007-03-31 23:27:41 -0700 | [diff] [blame] | 393 | GIT_INDEX_FILE="$THIS_INDEX" \ |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 394 | git read-tree --index-output="$TMP_INDEX" -i -m HEAD |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 395 | else |
| 396 | rm -f "$TMP_INDEX" |
| 397 | fi || exit |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 398 | |
Junio C Hamano | 293623e | 2007-05-25 22:00:54 -0700 | [diff] [blame] | 399 | printf '%s\n' "$commit_only" | |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 400 | GIT_INDEX_FILE="$TMP_INDEX" \ |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 401 | git update-index --add --remove --stdin && |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 402 | |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 403 | save_index && |
Junio C Hamano | 293623e | 2007-05-25 22:00:54 -0700 | [diff] [blame] | 404 | printf '%s\n' "$commit_only" | |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 405 | ( |
| 406 | GIT_INDEX_FILE="$NEXT_INDEX" |
| 407 | export GIT_INDEX_FILE |
Junio C Hamano | cba8d48 | 2007-09-14 16:53:58 -0700 | [diff] [blame] | 408 | git update-index --add --remove --stdin |
Martin Waitz | 3de63c3 | 2006-10-07 21:07:40 +0200 | [diff] [blame] | 409 | ) || exit |
| 410 | ;; |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 411 | esac |
Junio C Hamano | f678dd1 | 2005-11-25 13:33:14 -0800 | [diff] [blame] | 412 | ;; |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 413 | esac |
| 414 | |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 415 | ################################################################ |
| 416 | # If we do as-is commit, the index file will be THIS_INDEX, |
| 417 | # otherwise NEXT_INDEX after we make this commit. We leave |
| 418 | # the index as is if we abort. |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 419 | |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 420 | if test -f "$NEXT_INDEX" |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 421 | then |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 422 | USE_INDEX="$NEXT_INDEX" |
| 423 | else |
| 424 | USE_INDEX="$THIS_INDEX" |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 425 | fi |
| 426 | |
Junio C Hamano | 2b5f9a8 | 2007-02-22 00:28:49 -0800 | [diff] [blame] | 427 | case "$status_only" in |
| 428 | t) |
| 429 | # This will silently fail in a read-only repository, which is |
| 430 | # what we want. |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 431 | GIT_INDEX_FILE="$USE_INDEX" git update-index -q --unmerged --refresh |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 432 | run_status |
| 433 | exit $? |
Junio C Hamano | 2b5f9a8 | 2007-02-22 00:28:49 -0800 | [diff] [blame] | 434 | ;; |
| 435 | '') |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 436 | GIT_INDEX_FILE="$USE_INDEX" git update-index -q --refresh || exit |
Junio C Hamano | 2b5f9a8 | 2007-02-22 00:28:49 -0800 | [diff] [blame] | 437 | ;; |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 438 | esac |
| 439 | |
| 440 | ################################################################ |
| 441 | # Grab commit message, write out tree and make commit. |
| 442 | |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 443 | if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit |
| 444 | then |
| 445 | if test "$TMP_INDEX" |
| 446 | then |
| 447 | GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit |
| 448 | else |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 449 | GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 450 | fi || exit |
| 451 | fi |
Junio C Hamano | 0cfe1d3 | 2005-08-12 23:39:15 -0700 | [diff] [blame] | 452 | |
Junio C Hamano | aba2da1 | 2005-08-25 18:57:35 -0700 | [diff] [blame] | 453 | if test "$log_message" != '' |
| 454 | then |
Junio C Hamano | 293623e | 2007-05-25 22:00:54 -0700 | [diff] [blame] | 455 | printf '%s\n' "$log_message" |
Junio C Hamano | aba2da1 | 2005-08-25 18:57:35 -0700 | [diff] [blame] | 456 | elif test "$logfile" != "" |
| 457 | then |
| 458 | if test "$logfile" = - |
| 459 | then |
| 460 | test -t 0 && |
| 461 | echo >&2 "(reading log message from standard input)" |
| 462 | cat |
| 463 | else |
| 464 | cat <"$logfile" |
| 465 | fi |
| 466 | elif test "$use_commit" != "" |
| 467 | then |
Tom Prince | e0d10e1 | 2007-01-28 16:16:53 -0800 | [diff] [blame] | 468 | encoding=$(git config i18n.commitencoding || echo UTF-8) |
Junio C Hamano | 5ac2715 | 2007-01-13 13:33:07 -0800 | [diff] [blame] | 469 | git show -s --pretty=raw --encoding="$encoding" "$use_commit" | |
| 470 | sed -e '1,/^$/d' -e 's/^ //' |
Luben Tuikov | a9cb3c6 | 2006-10-12 14:52:42 -0700 | [diff] [blame] | 471 | elif test -f "$GIT_DIR/MERGE_MSG" |
Junio C Hamano | e521580 | 2005-11-01 22:01:28 -0800 | [diff] [blame] | 472 | then |
| 473 | cat "$GIT_DIR/MERGE_MSG" |
Junio C Hamano | 7d0c688 | 2006-06-23 01:37:02 -0700 | [diff] [blame] | 474 | elif test -f "$GIT_DIR/SQUASH_MSG" |
| 475 | then |
| 476 | cat "$GIT_DIR/SQUASH_MSG" |
Steven Grimm | d1cc130 | 2007-07-22 21:17:42 -0700 | [diff] [blame] | 477 | elif test "$templatefile" != "" |
| 478 | then |
| 479 | cat "$templatefile" |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 480 | fi | git stripspace >"$GIT_DIR"/COMMIT_EDITMSG |
Junio C Hamano | 2d56993 | 2005-08-31 17:15:25 -0700 | [diff] [blame] | 481 | |
| 482 | case "$signoff" in |
| 483 | t) |
Gerrit Pape | a734291 | 2007-07-06 14:42:27 +0000 | [diff] [blame] | 484 | sign=$(git-var GIT_COMMITTER_IDENT | sed -e ' |
| 485 | s/>.*/>/ |
| 486 | s/^/Signed-off-by: / |
| 487 | ') |
| 488 | blank_before_signoff= |
Junio C Hamano | dbaa06a | 2007-01-29 01:06:27 -0800 | [diff] [blame] | 489 | tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG | |
Gerrit Pape | a734291 | 2007-07-06 14:42:27 +0000 | [diff] [blame] | 490 | grep 'Signed-off-by:' >/dev/null || blank_before_signoff=' |
| 491 | ' |
| 492 | tail -n 1 "$GIT_DIR"/COMMIT_EDITMSG | |
| 493 | grep "$sign"$ >/dev/null || |
| 494 | printf '%s%s\n' "$blank_before_signoff" "$sign" \ |
| 495 | >>"$GIT_DIR"/COMMIT_EDITMSG |
Junio C Hamano | 2d56993 | 2005-08-31 17:15:25 -0700 | [diff] [blame] | 496 | ;; |
| 497 | esac |
| 498 | |
Junio C Hamano | 475443c | 2006-04-12 11:45:18 -0700 | [diff] [blame] | 499 | if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then |
Junio C Hamano | 2d56993 | 2005-08-31 17:15:25 -0700 | [diff] [blame] | 500 | echo "#" |
Alex Riesen | b6ae540 | 2006-01-05 12:44:59 +0100 | [diff] [blame] | 501 | echo "# It looks like you may be committing a MERGE." |
Junio C Hamano | 2d56993 | 2005-08-31 17:15:25 -0700 | [diff] [blame] | 502 | echo "# If this is not correct, please remove the file" |
Junio C Hamano | 293623e | 2007-05-25 22:00:54 -0700 | [diff] [blame] | 503 | printf '%s\n' "# $GIT_DIR/MERGE_HEAD" |
Junio C Hamano | 2d56993 | 2005-08-31 17:15:25 -0700 | [diff] [blame] | 504 | echo "# and try again" |
| 505 | echo "#" |
Santi_Béjar | f8e2c54 | 2005-10-09 17:30:19 -0700 | [diff] [blame] | 506 | fi >>"$GIT_DIR"/COMMIT_EDITMSG |
Junio C Hamano | aba2da1 | 2005-08-25 18:57:35 -0700 | [diff] [blame] | 507 | |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 508 | # Author |
Junio C Hamano | 83e24dc | 2007-01-22 13:03:31 -0800 | [diff] [blame] | 509 | if test '' != "$use_commit" |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 510 | then |
Johannes Schindelin | 0cae234 | 2007-06-25 01:04:11 +0100 | [diff] [blame] | 511 | eval "$(get_author_ident_from_commit "$use_commit")" |
| 512 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 513 | fi |
Junio C Hamano | 83e24dc | 2007-01-22 13:03:31 -0800 | [diff] [blame] | 514 | if test '' != "$force_author" |
| 515 | then |
| 516 | GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` && |
| 517 | GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` && |
| 518 | test '' != "$GIT_AUTHOR_NAME" && |
| 519 | test '' != "$GIT_AUTHOR_EMAIL" || |
| 520 | die "malformed --author parameter" |
| 521 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL |
| 522 | fi |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 523 | |
Linus Torvalds | 96069cf | 2005-06-14 10:20:14 -0700 | [diff] [blame] | 524 | PARENTS="-p HEAD" |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 525 | if test -z "$initial_commit" |
Junio C Hamano | 8098a17 | 2005-09-30 14:26:57 -0700 | [diff] [blame] | 526 | then |
Shawn Pearce | a3a733e | 2006-07-10 22:48:47 -0400 | [diff] [blame] | 527 | rloga='commit' |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 528 | if [ -f "$GIT_DIR/MERGE_HEAD" ]; then |
Shawn Pearce | a3a733e | 2006-07-10 22:48:47 -0400 | [diff] [blame] | 529 | rloga='commit (merge)' |
Junio C Hamano | 91063bb | 2005-09-08 13:47:12 -0700 | [diff] [blame] | 530 | PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"` |
Junio C Hamano | b4019f0 | 2006-03-02 21:04:05 -0800 | [diff] [blame] | 531 | elif test -n "$amend"; then |
Shawn Pearce | a3a733e | 2006-07-10 22:48:47 -0400 | [diff] [blame] | 532 | rloga='commit (amend)' |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 533 | PARENTS=$(git cat-file commit HEAD | |
Junio C Hamano | b4019f0 | 2006-03-02 21:04:05 -0800 | [diff] [blame] | 534 | sed -n -e '/^$/q' -e 's/^parent /-p /p') |
Junio C Hamano | aba2da1 | 2005-08-25 18:57:35 -0700 | [diff] [blame] | 535 | fi |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 536 | current="$(git rev-parse --verify HEAD)" |
Junio C Hamano | 8098a17 | 2005-09-30 14:26:57 -0700 | [diff] [blame] | 537 | else |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 538 | if [ -z "$(git ls-files)" ]; then |
Shawn O. Pearce | aeb80c7 | 2006-12-15 21:53:09 -0500 | [diff] [blame] | 539 | echo >&2 'nothing to commit (use "git add file1 file2" to include for commit)' |
Junio C Hamano | 8098a17 | 2005-09-30 14:26:57 -0700 | [diff] [blame] | 540 | exit 1 |
| 541 | fi |
| 542 | PARENTS="" |
Shawn Pearce | a3a733e | 2006-07-10 22:48:47 -0400 | [diff] [blame] | 543 | rloga='commit (initial)' |
Junio C Hamano | cede752 | 2006-09-27 02:06:31 -0700 | [diff] [blame] | 544 | current='' |
Linus Torvalds | 96069cf | 2005-06-14 10:20:14 -0700 | [diff] [blame] | 545 | fi |
Junio C Hamano | 23913dc | 2007-01-19 17:12:11 -0800 | [diff] [blame] | 546 | set_reflog_action "$rloga" |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 547 | |
Junio C Hamano | 475443c | 2006-04-12 11:45:18 -0700 | [diff] [blame] | 548 | if test -z "$no_edit" |
| 549 | then |
| 550 | { |
Martin Waitz | 88a1531 | 2006-05-26 01:42:18 +0200 | [diff] [blame] | 551 | echo "" |
| 552 | echo "# Please enter the commit message for your changes." |
| 553 | echo "# (Comment lines starting with '#' will not be included)" |
Junio C Hamano | 475443c | 2006-04-12 11:45:18 -0700 | [diff] [blame] | 554 | test -z "$only_include_assumed" || echo "$only_include_assumed" |
| 555 | run_status |
| 556 | } >>"$GIT_DIR"/COMMIT_EDITMSG |
| 557 | else |
| 558 | # we need to check if there is anything to commit |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 559 | run_status >/dev/null |
Junio C Hamano | 475443c | 2006-04-12 11:45:18 -0700 | [diff] [blame] | 560 | fi |
Dmitry V. Levin | 4fb5fd5 | 2007-09-12 20:14:22 +0400 | [diff] [blame] | 561 | if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ] |
Linus Torvalds | a3e870f | 2005-05-30 12:51:00 -0700 | [diff] [blame] | 562 | then |
Junio C Hamano | 7d0c688 | 2006-06-23 01:37:02 -0700 | [diff] [blame] | 563 | rm -f "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG" |
Brian Hetro | 09b0d9d | 2007-08-26 14:35:26 -0400 | [diff] [blame] | 564 | use_status_color=t |
Junio C Hamano | 5a798fb | 2006-02-05 16:08:01 -0800 | [diff] [blame] | 565 | run_status |
Linus Torvalds | a3e870f | 2005-05-30 12:51:00 -0700 | [diff] [blame] | 566 | exit 1 |
| 567 | fi |
Junio C Hamano | 475443c | 2006-04-12 11:45:18 -0700 | [diff] [blame] | 568 | |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 569 | case "$no_edit" in |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 570 | '') |
Sean | ec4e69c | 2006-05-13 23:09:32 -0400 | [diff] [blame] | 571 | git-var GIT_AUTHOR_IDENT > /dev/null || die |
| 572 | git-var GIT_COMMITTER_IDENT > /dev/null || die |
Adam Roben | ef0c2ab | 2007-07-19 22:09:35 -0700 | [diff] [blame] | 573 | git_editor "$GIT_DIR/COMMIT_EDITMSG" |
Junio C Hamano | 5fec3ef | 2005-06-25 02:22:05 -0700 | [diff] [blame] | 574 | ;; |
| 575 | esac |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 576 | |
| 577 | case "$verify" in |
| 578 | t) |
| 579 | if test -x "$GIT_DIR"/hooks/commit-msg |
| 580 | then |
Santi_Béjar | f8e2c54 | 2005-10-09 17:30:19 -0700 | [diff] [blame] | 581 | "$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 582 | fi |
| 583 | esac |
| 584 | |
Yann Dirson | 29f4ad8 | 2006-06-24 00:04:05 +0200 | [diff] [blame] | 585 | if test -z "$no_edit" |
| 586 | then |
| 587 | sed -e ' |
| 588 | /^diff --git a\/.*/{ |
| 589 | s/// |
| 590 | q |
| 591 | } |
| 592 | /^#/d |
| 593 | ' "$GIT_DIR"/COMMIT_EDITMSG |
| 594 | else |
| 595 | cat "$GIT_DIR"/COMMIT_EDITMSG |
| 596 | fi | |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 597 | git stripspace >"$GIT_DIR"/COMMIT_MSG |
Santi_Béjar | f8e2c54 | 2005-10-09 17:30:19 -0700 | [diff] [blame] | 598 | |
Steven Grimm | d1cc130 | 2007-07-22 21:17:42 -0700 | [diff] [blame] | 599 | # Test whether the commit message has any content we didn't supply. |
| 600 | have_commitmsg= |
| 601 | grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG | |
| 602 | git stripspace > "$GIT_DIR"/COMMIT_BAREMSG |
| 603 | |
| 604 | # Is the commit message totally empty? |
| 605 | if test -s "$GIT_DIR"/COMMIT_BAREMSG |
| 606 | then |
| 607 | if test "$templatefile" != "" |
| 608 | then |
| 609 | # Test whether this is just the unaltered template. |
| 610 | if cnt=`sed -e '/^#/d' < "$templatefile" | |
| 611 | git stripspace | |
| 612 | diff "$GIT_DIR"/COMMIT_BAREMSG - | |
| 613 | wc -l` && |
| 614 | test 0 -lt $cnt |
| 615 | then |
| 616 | have_commitmsg=t |
| 617 | fi |
| 618 | else |
| 619 | # No template, so the content in the commit message must |
| 620 | # have come from the user. |
| 621 | have_commitmsg=t |
| 622 | fi |
| 623 | fi |
| 624 | |
| 625 | rm -f "$GIT_DIR"/COMMIT_BAREMSG |
| 626 | |
| 627 | if test "$have_commitmsg" = "t" |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 628 | then |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 629 | if test -z "$TMP_INDEX" |
| 630 | then |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 631 | tree=$(GIT_INDEX_FILE="$USE_INDEX" git write-tree) |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 632 | else |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 633 | tree=$(GIT_INDEX_FILE="$TMP_INDEX" git write-tree) && |
Junio C Hamano | 130fcca | 2006-02-05 00:07:44 -0800 | [diff] [blame] | 634 | rm -f "$TMP_INDEX" |
| 635 | fi && |
Josh Triplett | 9d6f220 | 2007-07-14 01:05:43 -0700 | [diff] [blame] | 636 | commit=$(git commit-tree $tree $PARENTS <"$GIT_DIR/COMMIT_MSG") && |
Shawn Pearce | 67644a4 | 2006-05-19 05:16:18 -0400 | [diff] [blame] | 637 | rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) && |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 638 | git update-ref -m "$GIT_REFLOG_ACTION: $rlogm" HEAD $commit "$current" && |
Luben Tuikov | a9cb3c6 | 2006-10-12 14:52:42 -0700 | [diff] [blame] | 639 | rm -f -- "$GIT_DIR/MERGE_HEAD" "$GIT_DIR/MERGE_MSG" && |
Junio C Hamano | cf7bb58 | 2006-02-10 00:45:59 -0800 | [diff] [blame] | 640 | if test -f "$NEXT_INDEX" |
| 641 | then |
| 642 | mv "$NEXT_INDEX" "$THIS_INDEX" |
| 643 | else |
| 644 | : ;# happy |
| 645 | fi |
Junio C Hamano | 0c09129 | 2005-08-08 17:03:14 -0700 | [diff] [blame] | 646 | else |
| 647 | echo >&2 "* no commit message? aborting commit." |
| 648 | false |
| 649 | fi |
Linus Torvalds | 170241b | 2005-06-19 19:57:01 -0700 | [diff] [blame] | 650 | ret="$?" |
Junio C Hamano | 7d0c688 | 2006-06-23 01:37:02 -0700 | [diff] [blame] | 651 | rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG" |
Junio C Hamano | c93d88a | 2007-03-05 12:35:41 -0800 | [diff] [blame] | 652 | |
| 653 | cd_to_toplevel |
| 654 | |
Johannes Schindelin | b4372ef | 2007-07-06 13:05:59 +0100 | [diff] [blame] | 655 | git rerere |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 656 | |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 657 | if test "$ret" = 0 |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 658 | then |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 659 | if test -x "$GIT_DIR"/hooks/post-commit |
| 660 | then |
| 661 | "$GIT_DIR"/hooks/post-commit |
| 662 | fi |
| 663 | if test -z "$quiet" |
| 664 | then |
Junio C Hamano | 5be6007 | 2007-07-02 22:52:14 -0700 | [diff] [blame] | 665 | commit=`git diff-tree --always --shortstat --pretty="format:%h: %s"\ |
Michael S. Tsirkin | c7263d4 | 2007-04-16 08:51:11 +0300 | [diff] [blame] | 666 | --summary --root HEAD --` |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 667 | echo "Created${initial_commit:+ initial} commit $commit" |
Nicolas Pitre | ebd124c | 2006-12-14 23:15:44 -0500 | [diff] [blame] | 668 | fi |
Junio C Hamano | 89e2c5f | 2005-08-18 17:20:08 -0700 | [diff] [blame] | 669 | fi |
Junio C Hamano | 61f5cb7 | 2006-10-24 21:48:55 -0700 | [diff] [blame] | 670 | |
Linus Torvalds | 170241b | 2005-06-19 19:57:01 -0700 | [diff] [blame] | 671 | exit "$ret" |