2150cc99fe
The recent change to give the multiple commit message source was not carrying over the authorship information from -C/-c commits correctly. The export of the environment variable happens only in the subprocess, not the main process that eventually runs git-commit-tree. The right fix might be to teach git-commit-script to grok the From: and Date: lines at the beginning of the commit message just like git-applymbox knows how, but this has to do until that enhancement happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
266 lines
6.0 KiB
Bash
Executable File
266 lines
6.0 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Linus Torvalds
|
|
#
|
|
|
|
. git-sh-setup-script || die "Not a git archive"
|
|
|
|
usage () {
|
|
die 'git commit [-a] [-m <message>] [-F <logfile>] [(-C|-c) <commit>] [<path>...]'
|
|
}
|
|
|
|
all= logfile= use_commit= no_edit= log_given= log_message= verify= signoff=
|
|
while case "$#" in 0) break;; esac
|
|
do
|
|
case "$1" in
|
|
-a|--a|--al|--all)
|
|
all=t
|
|
shift ;;
|
|
-F=*|--f=*|--fi=*|--fil=*|--file=*)
|
|
log_given=t$log_given
|
|
logfile=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
no_edit=t
|
|
shift ;;
|
|
-F|--f|--fi|--fil|--file)
|
|
case "$#" in 1) usage ;; esac; shift
|
|
log_given=t$log_given
|
|
logfile="$1"
|
|
no_edit=t
|
|
shift ;;
|
|
-m=*|--m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*)
|
|
log_given=t$log_given
|
|
log_message=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
no_edit=t
|
|
shift ;;
|
|
-m|--m|--me|--mes|--mess|--messa|--messag|--message)
|
|
case "$#" in 1) usage ;; esac; shift
|
|
log_given=t$log_given
|
|
log_message="$1"
|
|
no_edit=t
|
|
shift ;;
|
|
-c=*|--ree=*|--reed=*|--reedi=*|--reedit=*|--reedit-=*|--reedit-m=*|\
|
|
--reedit-me=*|--reedit-mes=*|--reedit-mess=*|--reedit-messa=*|\
|
|
--reedit-messag=*|--reedit-message=*)
|
|
log_given=t$log_given
|
|
use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
shift ;;
|
|
-c|--ree|--reed|--reedi|--reedit|--reedit-|--reedit-m|--reedit-me|\
|
|
--reedit-mes|--reedit-mess|--reedit-messa|--reedit-messag|--reedit-message)
|
|
case "$#" in 1) usage ;; esac; shift
|
|
log_given=t$log_given
|
|
use_commit="$1"
|
|
shift ;;
|
|
-C=*|--reu=*|--reus=*|--reuse=*|--reuse-=*|--reuse-m=*|--reuse-me=*|\
|
|
--reuse-mes=*|--reuse-mess=*|--reuse-messa=*|--reuse-messag=*|\
|
|
--reuse-message=*)
|
|
log_given=t$log_given
|
|
use_commit=`expr "$1" : '-[^=]*=\(.*\)'`
|
|
no_edit=t
|
|
shift ;;
|
|
-C|--reu|--reus|--reuse|--reuse-|--reuse-m|--reuse-me|--reuse-mes|\
|
|
--reuse-mess|--reuse-messa|--reuse-messag|--reuse-message)
|
|
case "$#" in 1) usage ;; esac; shift
|
|
log_given=t$log_given
|
|
use_commit="$1"
|
|
no_edit=t
|
|
shift ;;
|
|
-s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
|
|
signoff=t
|
|
shift ;;
|
|
-v|--v|--ve|--ver|--veri|--verif|--verify)
|
|
verify=t
|
|
shift ;;
|
|
--)
|
|
shift
|
|
break ;;
|
|
-*)
|
|
usage ;;
|
|
*)
|
|
break ;;
|
|
esac
|
|
done
|
|
|
|
case "$log_given" in
|
|
tt*)
|
|
die "Only one of -c/-C/-F/-m can be used." ;;
|
|
esac
|
|
|
|
case "$all" in
|
|
t)
|
|
git-diff-files --name-only -z |
|
|
xargs -0 git-update-cache -q -- || exit 1 ;;
|
|
esac
|
|
git-update-cache -q --refresh -- "$@" || exit 1
|
|
|
|
case "$verify" in
|
|
t)
|
|
# This is slightly modified from Andrew Morton's Perfect Patch.
|
|
# Lines you introduce should not have trailing whitespace.
|
|
# Also check for an indentation that has SP before a TAB.
|
|
perl -e '
|
|
my $fh;
|
|
my $found_bad = 0;
|
|
my $filename;
|
|
my $reported_filename = "";
|
|
my $lineno;
|
|
sub bad_line {
|
|
my ($why, $line) = @_;
|
|
if (!$found_bad) {
|
|
print "*\n";
|
|
print "* You have some suspicious patch lines:\n";
|
|
print "*\n";
|
|
$found_bad = 1;
|
|
}
|
|
if ($reported_filename ne $filename) {
|
|
print "* In $filename\n";
|
|
$reported_filename = $filename;
|
|
}
|
|
print "* $why (line $lineno)\n$line\n";
|
|
}
|
|
open $fh, "-|", qw(git-diff-cache -p -M --cached HEAD);
|
|
while (<$fh>) {
|
|
if (m|^diff --git a/(.*) b/\1$|) {
|
|
$filename = $1;
|
|
next;
|
|
}
|
|
if (/^@@ -\S+ \+(\d+)/) {
|
|
$lineno = $1 - 1;
|
|
next;
|
|
}
|
|
if (/^ /) {
|
|
$lineno++;
|
|
next;
|
|
}
|
|
if (s/^\+//) {
|
|
$lineno++;
|
|
chomp;
|
|
if (/\s$/) {
|
|
bad_line("trailing whitespace", $_);
|
|
}
|
|
if (/^\s* /) {
|
|
bad_line("indent SP followed by a TAB", $_);
|
|
}
|
|
}
|
|
}
|
|
exit($found_bad);
|
|
' || exit ;;
|
|
esac
|
|
|
|
PARENTS="-p HEAD"
|
|
if [ ! -r "$GIT_DIR/HEAD" ]; then
|
|
if [ -z "$(git-ls-files)" ]; then
|
|
echo Nothing to commit 1>&2
|
|
exit 1
|
|
fi
|
|
{
|
|
echo "#"
|
|
echo "# Initial commit"
|
|
case "$no_edit" in
|
|
t) echo "# (ignoring your commit message for initial commit)"
|
|
no_edit=
|
|
esac
|
|
echo "#"
|
|
git-ls-files | sed 's/^/# New file: /'
|
|
echo "#"
|
|
} >.editmsg
|
|
PARENTS=""
|
|
no_edit=
|
|
else
|
|
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
|
|
{
|
|
echo "#"
|
|
echo "# It looks like your may be committing a MERGE."
|
|
echo "# If this is not correct, please remove the file"
|
|
echo "# $GIT_DIR/MERGE_HEAD"
|
|
echo "# and try again"
|
|
case "$no_edit" in
|
|
t) echo "# (ignoring your commit message for merge commit)"
|
|
no_edit=
|
|
esac
|
|
echo "#"
|
|
} |
|
|
git-stripspace >.editmsg
|
|
PARENTS="-p HEAD -p MERGE_HEAD"
|
|
elif test "$log_message" != ''
|
|
then
|
|
echo "$log_message" |
|
|
git-stripspace >.editmsg
|
|
elif test "$logfile" != ""
|
|
then
|
|
if test "$logfile" = -
|
|
then
|
|
test -t 0 &&
|
|
echo >&2 "(reading log message from standard input)"
|
|
cat
|
|
else
|
|
cat <"$logfile"
|
|
fi |
|
|
git-stripspace >.editmsg
|
|
elif test "$use_commit" != ""
|
|
then
|
|
pick_author_script='
|
|
/^author /{
|
|
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" |
|
|
sed -ne "$pick_author_script"`
|
|
eval "$set_author_env"
|
|
export GIT_AUTHOR_NAME
|
|
export GIT_AUTHOR_EMAIL
|
|
export GIT_AUTHOR_DATE
|
|
git-cat-file commit "$use_commit" |
|
|
sed -e '1,/^$/d' |
|
|
git-stripspace >.editmsg
|
|
fi
|
|
|
|
case "$signoff" in
|
|
t)
|
|
git-var GIT_COMMITTER_IDENT | sed -e '
|
|
s/>.*/>/
|
|
s/^/Signed-off-by: /' >>.editmsg ;;
|
|
esac
|
|
git-status-script >>.editmsg
|
|
fi
|
|
if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
|
|
then
|
|
cat .editmsg
|
|
rm .editmsg
|
|
exit 1
|
|
fi
|
|
case "$no_edit" in
|
|
'')
|
|
${VISUAL:-${EDITOR:-vi}} .editmsg
|
|
;;
|
|
esac
|
|
grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
|
|
grep -v -i '^Signed-off-by' .cmitmsg >.cmitchk
|
|
if test -s .cmitchk
|
|
then
|
|
tree=$(git-write-tree) &&
|
|
commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
|
|
echo $commit > "$GIT_DIR/HEAD" &&
|
|
rm -f -- "$GIT_DIR/MERGE_HEAD"
|
|
else
|
|
echo >&2 "* no commit message? aborting commit."
|
|
false
|
|
fi
|
|
ret="$?"
|
|
rm -f .cmitmsg .editmsg .cmitchk
|
|
exit "$ret"
|