git-commit.sh 15.2 KB
Newer Older
L
Linus Torvalds 已提交
1
#!/bin/sh
2 3
#
# Copyright (c) 2005 Linus Torvalds
4 5
# Copyright (c) 2006 Junio C Hamano

6
USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-u] [--amend] [-e] [--author <author>] [[-i | -o] <path>...]'
7
SUBDIRECTORY_OK=Yes
8
. git-sh-setup
9

J
Junio C Hamano 已提交
10 11 12 13 14 15 16 17 18 19 20
git-rev-parse --verify HEAD >/dev/null 2>&1 || initial_commit=t
branch=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD)

case "$0" in
*status)
	status_only=t
	unmerged_ok_if_status=--unmerged ;;
*commit)
	status_only=
	unmerged_ok_if_status= ;;
esac
21 22 23 24 25 26 27

refuse_partial () {
	echo >&2 "$1"
	echo >&2 "You might have meant to say 'git commit -i paths...', perhaps?"
	exit 1
}

J
Junio C Hamano 已提交
28 29 30
THIS_INDEX="$GIT_DIR/index"
NEXT_INDEX="$GIT_DIR/next-index$$"
rm -f "$NEXT_INDEX"
J
Junio C Hamano 已提交
31
save_index () {
J
Junio C Hamano 已提交
32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
	cp "$THIS_INDEX" "$NEXT_INDEX"
}

report () {
  header="#
# $1:
#   ($2)
#
"
  trailer=""
  while read status name newname
  do
    printf '%s' "$header"
    header=""
    trailer="#
"
    case "$status" in
    M ) echo "#	modified: $name";;
    D*) echo "#	deleted:  $name";;
    T ) echo "#	typechange: $name";;
    C*) echo "#	copied: $name -> $newname";;
    R*) echo "#	renamed: $name -> $newname";;
    A*) echo "#	new file: $name";;
    U ) echo "#	unmerged: $name";;
    esac
  done
  printf '%s' "$trailer"
  [ "$header" ]
J
Junio C Hamano 已提交
60 61 62
}

run_status () {
J
Junio C Hamano 已提交
63 64 65 66
    (
	# We always show status for the whole tree.
	cd "$TOP"

J
Junio C Hamano 已提交
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82
	IS_INITIAL="$initial_commit"
	REFERENCE=HEAD
	case "$amend" in
	t)
		# If we are amending the initial commit, there
		# is no HEAD^1.
		if git-rev-parse --verify "HEAD^1" >/dev/null 2>&1
		then
			REFERENCE="HEAD^1"
			IS_INITIAL=
		else
			IS_INITIAL=t
		fi
		;;
	esac

J
Junio C Hamano 已提交
83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
	# If TMP_INDEX is defined, that means we are doing
	# "--only" partial commit, and that index file is used
	# to build the tree for the commit.  Otherwise, if
	# NEXT_INDEX exists, that is the index file used to
	# make the commit.  Otherwise we are using as-is commit
	# so the regular index file is what we use to compare.
	if test '' != "$TMP_INDEX"
	then
	    GIT_INDEX_FILE="$TMP_INDEX"
	    export GIT_INDEX_FILE
	elif test -f "$NEXT_INDEX"
	then
	    GIT_INDEX_FILE="$NEXT_INDEX"
	    export GIT_INDEX_FILE
	fi

	case "$branch" in
	refs/heads/master) ;;
	*)  echo "# On branch $branch" ;;
	esac

J
Junio C Hamano 已提交
104
	if test -z "$IS_INITIAL"
J
Junio C Hamano 已提交
105
	then
106
	    git-diff-index -M --cached --name-status \
J
Junio C Hamano 已提交
107
		--diff-filter=MDTCRA $REFERENCE |
108 109 110 111 112
	    sed -e '
		    s/\\/\\\\/g
		    s/ /\\ /g
	    ' |
	    report "Updated but not checked in" "will commit"
J
Junio C Hamano 已提交
113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136
	    committable="$?"
	else
	    echo '#
# Initial commit
#'
	    git-ls-files |
	    sed -e '
		    s/\\/\\\\/g
		    s/ /\\ /g
		    s/^/A /
	    ' |
	    report "Updated but not checked in" "will commit"

	    committable="$?"
	fi

	git-diff-files  --name-status |
	sed -e '
		s/\\/\\\\/g
		s/ /\\ /g
	' |
	report "Changed but not updated" \
	    "use git-update-index to mark for commit"

137 138 139 140
        option=""
        if test -z "$untracked_files"; then
            option="--directory --no-empty-directory"
        fi
J
Junio C Hamano 已提交
141 142
	if test -f "$GIT_DIR/info/exclude"
	then
143
	    git-ls-files -z --others $option \
J
Junio C Hamano 已提交
144 145 146
		--exclude-from="$GIT_DIR/info/exclude" \
		--exclude-per-directory=.gitignore
	else
147
	    git-ls-files -z --others $option \
J
Junio C Hamano 已提交
148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166
		--exclude-per-directory=.gitignore
	fi |
	perl -e '$/ = "\0";
	    my $shown = 0;
	    while (<>) {
		chomp;
		s|\\|\\\\|g;
		s|\t|\\t|g;
		s|\n|\\n|g;
		s/^/#	/;
		if (!$shown) {
		    print "#\n# Untracked files:\n";
		    print "#   (use \"git add\" to add to commit)\n";
		    print "#\n";
		    $shown = 1;
		}
		print "$_\n";
	    }
	'
167

Y
Yasushi SHOJI 已提交
168
	if test -n "$verbose" -a -z "$IS_INITIAL"
169
	then
J
Junio C Hamano 已提交
170
	    git-diff-index --cached -M -p --diff-filter=MDTCRA $REFERENCE
171
	fi
J
Junio C Hamano 已提交
172 173
	case "$committable" in
	0)
J
Junio C Hamano 已提交
174 175 176 177 178 179 180
		case "$amend" in
		t)
			echo "# No changes" ;;
		*)
			echo "nothing to commit" ;;
		esac
		exit 1 ;;
J
Junio C Hamano 已提交
181 182 183
	esac
	exit 0
    )
J
Junio C Hamano 已提交
184 185
}

J
Junio C Hamano 已提交
186 187 188 189 190 191 192 193 194 195
trap '
	test -z "$TMP_INDEX" || {
		test -f "$TMP_INDEX" && rm -f "$TMP_INDEX"
	}
	rm -f "$NEXT_INDEX"
' 0

################################################################
# Command line argument parsing and sanity checking

196 197
all=
also=
J
Junio C Hamano 已提交
198
only=
199 200
logfile=
use_commit=
J
Junio C Hamano 已提交
201
amend=
202 203 204 205
no_edit=
log_given=
log_message=
verify=t
J
Junio C Hamano 已提交
206
verbose=
207 208
signoff=
force_author=
209
only_include_assumed=
210
untracked_files=
211
while case "$#" in 0) break;; esac
212
do
213
  case "$1" in
214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233
  -F|--F|-f|--f|--fi|--fil|--file)
      case "$#" in 1) usage ;; esac
      shift
      no_edit=t
      log_given=t$log_given
      logfile="$1"
      shift
      ;;
  -F*|-f*)
      no_edit=t
      log_given=t$log_given
      logfile=`expr "$1" : '-[Ff]\(.*\)'`
      shift
      ;;
  --F=*|--f=*|--fi=*|--fil=*|--file=*)
      no_edit=t
      log_given=t$log_given
      logfile=`expr "$1" : '-[^=]*=\(.*\)'`
      shift
      ;;
234
  -a|--a|--al|--all)
235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
      all=t
      shift
      ;;
  --au=*|--aut=*|--auth=*|--autho=*|--author=*)
      force_author=`expr "$1" : '-[^=]*=\(.*\)'`
      shift
      ;;
  --au|--aut|--auth|--autho|--author)
      case "$#" in 1) usage ;; esac
      shift
      force_author="$1"
      shift
      ;;
  -e|--e|--ed|--edi|--edit)
      no_edit=
      shift
      ;;
  -i|--i|--in|--inc|--incl|--inclu|--includ|--include)
      also=t
      shift
      ;;
J
Junio C Hamano 已提交
256 257 258 259
  -o|--o|--on|--onl|--only)
      only=t
      shift
      ;;
260
  -m|--m|--me|--mes|--mess|--messa|--messag|--message)
261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283
      case "$#" in 1) usage ;; esac
      shift
      log_given=t$log_given
      log_message="$1"
      no_edit=t
      shift
      ;;
  -m*)
      log_given=t$log_given
      log_message=`expr "$1" : '-m\(.*\)'`
      no_edit=t
      shift
      ;;
  --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
      log_given=t$log_given
      log_message=`expr "$1" : '-[^=]*=\(.*\)'`
      no_edit=t
      shift
      ;;
  -n|--n|--no|--no-|--no-v|--no-ve|--no-ver|--no-veri|--no-verif|--no-verify)
      verify=
      shift
      ;;
J
Junio C Hamano 已提交
284 285 286 287 288 289
  --a|--am|--ame|--amen|--amend)
      amend=t
      log_given=t$log_given
      use_commit=HEAD
      shift
      ;;
290 291 292 293 294 295 296 297 298
  -c)
      case "$#" in 1) usage ;; esac
      shift
      log_given=t$log_given
      use_commit="$1"
      no_edit=
      shift
      ;;
  --ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
299 300
  --reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
  --reedit-messag=*|--reedit-message=*)
301 302 303 304 305 306
      log_given=t$log_given
      use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
      no_edit=
      shift
      ;;
  --ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
307
  --reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)
308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323
      case "$#" in 1) usage ;; esac
      shift
      log_given=t$log_given
      use_commit="$1"
      no_edit=
      shift
      ;;
  -C)
      case "$#" in 1) usage ;; esac
      shift
      log_given=t$log_given
      use_commit="$1"
      no_edit=t
      shift
      ;;
  --reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
324 325
  --reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
  --reuse-message=*)
326 327 328 329 330 331
      log_given=t$log_given
      use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
      no_edit=t
      shift
      ;;
  --reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
332
  --reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
333 334 335 336 337 338 339
      case "$#" in 1) usage ;; esac
      shift
      log_given=t$log_given
      use_commit="$1"
      no_edit=t
      shift
      ;;
340
  -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
341 342 343
      signoff=t
      shift
      ;;
J
Junio C Hamano 已提交
344 345 346
  -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
      verbose=t
      shift
347
      ;;
348 349 350 351 352 353
  -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|--untracked|\
  --untracked-|--untracked-f|--untracked-fi|--untracked-fil|--untracked-file|\
  --untracked-files)
      untracked_files=t
      shift
      ;;
354
  --)
355 356 357
      shift
      break
      ;;
358
  -*)
359 360
      usage
      ;;
361
  *)
362 363
      break
      ;;
364
  esac
365 366
done

J
Junio C Hamano 已提交
367 368 369
################################################################
# Sanity check options

J
Junio C Hamano 已提交
370 371 372 373 374 375 376 377 378
case "$amend,$initial_commit" in
t,t)
  die "You do not have anything to amend." ;;
t,)
  if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
    die "You are in the middle of a merge -- cannot amend."
  fi ;;
esac

379 380 381 382 383
case "$log_given" in
tt*)
  die "Only one of -c/-C/-F/-m can be used." ;;
esac

J
Junio C Hamano 已提交
384 385
case "$#,$also,$only,$amend" in
*,t,t,*)
J
Junio C Hamano 已提交
386
  die "Only one of --include/--only can be used." ;;
J
Junio C Hamano 已提交
387
0,t,,* | 0,,t,)
J
Junio C Hamano 已提交
388
  die "No paths with --include/--only does not make sense." ;;
J
Junio C Hamano 已提交
389 390 391
0,,t,t)
  only_include_assumed="# Clever... amending the last one with dirty index." ;;
0,,,*)
J
Junio C Hamano 已提交
392
  ;;
J
Junio C Hamano 已提交
393
*,,,*)
J
Junio C Hamano 已提交
394
  only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
395
  also=
J
Junio C Hamano 已提交
396 397 398
  ;;
esac
unset only
J
Junio C Hamano 已提交
399 400 401 402 403 404 405 406 407 408 409
case "$all,$also,$#" in
t,t,*)
	die "Cannot use -a and -i at the same time." ;;
t,,[1-9]*)
	die "Paths with -a does not make sense." ;;
,t,0)
	die "No paths with -i does not make sense." ;;
esac

################################################################
# Prepare index to have a tree to be committed
J
Junio C Hamano 已提交
410

411
TOP=`git-rev-parse --show-cdup`
J
Junio C Hamano 已提交
412 413 414 415
if test -z "$TOP"
then
	TOP=./
fi
416 417 418

case "$all,$also" in
t,)
J
Junio C Hamano 已提交
419
	save_index &&
420
	(
J
Junio C Hamano 已提交
421
		cd "$TOP"
J
Junio C Hamano 已提交
422 423
		GIT_INDEX_FILE="$NEXT_INDEX"
		export GIT_INDEX_FILE
424 425 426
		git-diff-files --name-only -z |
		git-update-index --remove -z --stdin
	)
J
Junio C Hamano 已提交
427
	;;
428
,t)
J
Junio C Hamano 已提交
429
	save_index &&
430 431
	git-ls-files --error-unmatch -- "$@" >/dev/null || exit

432
	git-diff-files --name-only -z -- "$@"  |
J
Junio C Hamano 已提交
433 434 435 436 437 438
	(
		cd "$TOP"
		GIT_INDEX_FILE="$NEXT_INDEX"
		export GIT_INDEX_FILE
		git-update-index --remove -z --stdin
	)
439
	;;
440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
,)
	case "$#" in
	0)
	    ;; # commit as-is
	*)
	    if test -f "$GIT_DIR/MERGE_HEAD"
	    then
		refuse_partial "Cannot do a partial commit during a merge."
	    fi
	    TMP_INDEX="$GIT_DIR/tmp-index$$"
	    if test -z "$initial_commit"
	    then
		# make sure index is clean at the specified paths, or
		# they are additions.
		dirty_in_index=`git-diff-index --cached --name-status \
J
Junio C Hamano 已提交
455
			--diff-filter=DMTU HEAD -- "$@"`
456
		test -z "$dirty_in_index" ||
J
Junio C Hamano 已提交
457
		refuse_partial "Different in index and the last commit:
458 459
$dirty_in_index"
	    fi
460
	    commit_only=`git-ls-files --error-unmatch -- "$@"` || exit
J
Junio C Hamano 已提交
461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483

	    # Build the temporary index and update the real index
	    # the same way.
	    if test -z "$initial_commit"
	    then
		cp "$THIS_INDEX" "$TMP_INDEX"
		GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
	    else
		    rm -f "$TMP_INDEX"
	    fi || exit

	    echo "$commit_only" |
	    GIT_INDEX_FILE="$TMP_INDEX" \
	    git-update-index --add --remove --stdin &&

	    save_index &&
	    echo "$commit_only" |
	    (
		GIT_INDEX_FILE="$NEXT_INDEX"
		export GIT_INDEX_FILE
		git-update-index --remove --stdin
	    ) || exit
	    ;;
484 485 486 487
	esac
	;;
esac

J
Junio C Hamano 已提交
488 489 490 491
################################################################
# If we do as-is commit, the index file will be THIS_INDEX,
# otherwise NEXT_INDEX after we make this commit.  We leave
# the index as is if we abort.
492

J
Junio C Hamano 已提交
493
if test -f "$NEXT_INDEX"
494
then
J
Junio C Hamano 已提交
495 496 497
	USE_INDEX="$NEXT_INDEX"
else
	USE_INDEX="$THIS_INDEX"
498 499
fi

J
Junio C Hamano 已提交
500 501 502 503 504 505 506 507 508 509 510 511 512 513 514
GIT_INDEX_FILE="$USE_INDEX" \
    git-update-index -q $unmerged_ok_if_status --refresh || exit

################################################################
# If the request is status, just show it and exit.

case "$0" in
*status)
	run_status
	exit $?
esac

################################################################
# Grab commit message, write out tree and make commit.

515 516 517 518 519 520
if test t = "$verify" && test -x "$GIT_DIR"/hooks/pre-commit
then
	if test "$TMP_INDEX"
	then
		GIT_INDEX_FILE="$TMP_INDEX" "$GIT_DIR"/hooks/pre-commit
	else
J
Junio C Hamano 已提交
521
		GIT_INDEX_FILE="$USE_INDEX" "$GIT_DIR"/hooks/pre-commit
522 523
	fi || exit
fi
524

525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540
if test "$log_message" != ''
then
	echo "$log_message"
elif test "$logfile" != ""
then
	if test "$logfile" = -
	then
		test -t 0 &&
		echo >&2 "(reading log message from standard input)"
		cat
	else
		cat <"$logfile"
	fi
elif test "$use_commit" != ""
then
	git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
541 542 543
elif test -f "$GIT_DIR/MERGE_HEAD" && test -f "$GIT_DIR/MERGE_MSG"
then
	cat "$GIT_DIR/MERGE_MSG"
544
fi | git-stripspace >"$GIT_DIR"/COMMIT_EDITMSG
545 546 547

case "$signoff" in
t)
548 549 550 551 552 553
	{
		echo
		git-var GIT_COMMITTER_IDENT | sed -e '
			s/>.*/>/
			s/^/Signed-off-by: /
		'
554
	} >>"$GIT_DIR"/COMMIT_EDITMSG
555 556 557
	;;
esac

558
if test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"; then
559
	echo "#"
A
Alex Riesen 已提交
560
	echo "# It looks like you may be committing a MERGE."
561 562 563 564
	echo "# If this is not correct, please remove the file"
	echo "#	$GIT_DIR/MERGE_HEAD"
	echo "# and try again"
	echo "#"
565
fi >>"$GIT_DIR"/COMMIT_EDITMSG
566

567
# Author
J
Junio C Hamano 已提交
568 569
if test '' != "$force_author"
then
570 571
	GIT_AUTHOR_NAME=`expr "z$force_author" : 'z\(.*[^ ]\) *<.*'` &&
	GIT_AUTHOR_EMAIL=`expr "z$force_author" : '.*\(<.*\)'` &&
J
Junio C Hamano 已提交
572 573 574 575 576
	test '' != "$GIT_AUTHOR_NAME" &&
	test '' != "$GIT_AUTHOR_EMAIL" ||
	die "malformatted --author parameter"
	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
elif test '' != "$use_commit"
577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606
then
	pick_author_script='
	/^author /{
		s/'\''/'\''\\'\'\''/g
		h
		s/^author \([^<]*\) <[^>]*> .*$/\1/
		s/'\''/'\''\'\'\''/g
		s/.*/GIT_AUTHOR_NAME='\''&'\''/p

		g
		s/^author [^<]* <\([^>]*\)> .*$/\1/
		s/'\''/'\''\'\'\''/g
		s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p

		g
		s/^author [^<]* <[^>]*> \(.*\)$/\1/
		s/'\''/'\''\'\'\''/g
		s/.*/GIT_AUTHOR_DATE='\''&'\''/p

		q
	}
	'
	set_author_env=`git-cat-file commit "$use_commit" |
	LANG=C LC_ALL=C sed -ne "$pick_author_script"`
	eval "$set_author_env"
	export GIT_AUTHOR_NAME
	export GIT_AUTHOR_EMAIL
	export GIT_AUTHOR_DATE
fi

607
PARENTS="-p HEAD"
608
if test -z "$initial_commit"
J
Junio C Hamano 已提交
609
then
610
	if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
J
Junio C Hamano 已提交
611
		PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"`
J
Junio C Hamano 已提交
612 613 614
	elif test -n "$amend"; then
		PARENTS=$(git-cat-file commit HEAD |
			sed -n -e '/^$/q' -e 's/^parent /-p /p')
615
	fi
616
	current=$(git-rev-parse --verify HEAD)
J
Junio C Hamano 已提交
617 618
else
	if [ -z "$(git-ls-files)" ]; then
J
Junio C Hamano 已提交
619
		echo >&2 Nothing to commit
J
Junio C Hamano 已提交
620 621 622
		exit 1
	fi
	PARENTS=""
623
	current=
624
fi
625

626 627 628 629 630 631 632 633 634 635
if test -z "$no_edit"
then
	{
		test -z "$only_include_assumed" || echo "$only_include_assumed"
		run_status
	} >>"$GIT_DIR"/COMMIT_EDITMSG
else
	# we need to check if there is anything to commit
	run_status >/dev/null 
fi
636
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
L
Linus Torvalds 已提交
637
then
638
	rm -f "$GIT_DIR/COMMIT_EDITMSG"
J
Junio C Hamano 已提交
639
	run_status
L
Linus Torvalds 已提交
640 641
	exit 1
fi
642

643
case "$no_edit" in
644
'')
645 646 647 648 649 650
	case "${VISUAL:-$EDITOR},$TERM" in
	,dumb)
		echo >&2 "Terminal is dumb but no VISUAL nor EDITOR defined."
		echo >&2 "Please supply the commit log message using either"
		echo >&2 "-m or -F option.  A boilerplate log message has"
		echo >&2 "been prepared in $GIT_DIR/COMMIT_EDITMSG"
651 652
		exit 1
		;;
653
	esac
654 655
	git-var GIT_AUTHOR_IDENT > /dev/null  || die
	git-var GIT_COMMITTER_IDENT > /dev/null  || die
656
	${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
657 658
	;;
esac
659 660 661 662 663

case "$verify" in
t)
	if test -x "$GIT_DIR"/hooks/commit-msg
	then
664
		"$GIT_DIR"/hooks/commit-msg "$GIT_DIR"/COMMIT_EDITMSG || exit
665 666 667
	fi
esac

J
Junio C Hamano 已提交
668
sed -e '
669 670 671 672 673
    /^diff --git a\/.*/{
	s///
	q
    }
    /^#/d
J
Junio C Hamano 已提交
674 675
' "$GIT_DIR"/COMMIT_EDITMSG |
git-stripspace >"$GIT_DIR"/COMMIT_MSG
676 677 678 679 680

if cnt=`grep -v -i '^Signed-off-by' "$GIT_DIR"/COMMIT_MSG |
	git-stripspace |
	wc -l` &&
   test 0 -lt $cnt
681
then
682 683
	if test -z "$TMP_INDEX"
	then
J
Junio C Hamano 已提交
684
		tree=$(GIT_INDEX_FILE="$USE_INDEX" git-write-tree)
685 686 687 688
	else
		tree=$(GIT_INDEX_FILE="$TMP_INDEX" git-write-tree) &&
		rm -f "$TMP_INDEX"
	fi &&
689
	commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
J
Junio C Hamano 已提交
690
	git-update-ref HEAD $commit $current &&
J
Junio C Hamano 已提交
691 692 693 694 695 696 697
	rm -f -- "$GIT_DIR/MERGE_HEAD" &&
	if test -f "$NEXT_INDEX"
	then
		mv "$NEXT_INDEX" "$THIS_INDEX"
	else
		: ;# happy
	fi
698 699 700 701
else
	echo >&2 "* no commit message?  aborting commit."
	false
fi
702
ret="$?"
703
rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
704 705 706 707
if test -d "$GIT_DIR/rr-cache"
then
	git-rerere
fi
708 709 710 711 712

if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
then
	"$GIT_DIR"/hooks/post-commit
fi
713
exit "$ret"