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