undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with master changes.

Browse Source
This commit is contained in:
Junio C Hamano 2005-08-15 17:02:31 -07:00
commit 14fb44880c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git-commit-script
View File

@ -167,6 +167,7 @@ if [ ! -r "$GIT_DIR/HEAD" ]; then
no_edit= no_edit=
else else
if [ -f "$GIT_DIR/MERGE_HEAD" ]; then if [ -f "$GIT_DIR/MERGE_HEAD" ]; then
{
echo "#" echo "#"
echo "# It looks like your may be committing a MERGE." echo "# It looks like your may be committing a MERGE."
echo "# If this is not correct, please remove the file" echo "# If this is not correct, please remove the file"
@ -177,10 +178,13 @@ else
no_edit= no_edit=
esac esac
echo "#" echo "#"
} |
git-stripspace >.editmsg
PARENTS="-p HEAD -p MERGE_HEAD" PARENTS="-p HEAD -p MERGE_HEAD"
elif test "$log_message" != '' elif test "$log_message" != ''
then then
echo "$log_message" echo "$log_message" |
git-stripspace >.editmsg
elif test "$logfile" != "" elif test "$logfile" != ""
then then
if test "$logfile" = - if test "$logfile" = -
@ -190,7 +194,8 @@ else
cat cat
else else
cat <"$logfile" cat <"$logfile"
fi fi |
git-stripspace >.editmsg
elif test "$use_commit" != "" elif test "$use_commit" != ""
then then
pick_author_script=' pick_author_script='
@ -220,9 +225,10 @@ else
export GIT_AUTHOR_EMAIL export GIT_AUTHOR_EMAIL
export GIT_AUTHOR_DATE export GIT_AUTHOR_DATE
git-cat-file commit "$use_commit" | git-cat-file commit "$use_commit" |
sed -e '1,/^$/d' sed -e '1,/^$/d' |
fi | git-stripspace >.editmsg
git-stripspace >.editmsg fi
case "$signoff" in case "$signoff" in
t) t)
git-var GIT_COMMITTER_IDENT | sed -e ' git-var GIT_COMMITTER_IDENT | sed -e '