Merge refs/heads/master from .

This commit is contained in:
Junio C Hamano 2005-09-01 01:02:39 -07:00
commit 80b52b0f9d
4 changed files with 61 additions and 31 deletions

View File

@ -232,6 +232,18 @@ diff --git a/pico/pico.c b/pico/pico.c
break;
(Daniel Barkalow)
> A patch to SubmittingPatches, MUA specific help section for
> users of Pine 4.63 would be very much appreciated.
Ah, it looks like a recent version changed the default behavior to do the
right thing, and inverted the sense of the configuration option. (Either
that or Gentoo did it.) So you need to set the
"no-strip-whitespace-before-send" option, unless the option you have is
"strip-whitespace-before-send", in which case you should avoid checking
it.
Thunderbird
-----------

View File

@ -113,21 +113,6 @@ t)
fi
esac
if [ ! -r "$GIT_DIR/HEAD" ]
then
echo "#"
echo "# Initial commit"
echo "#"
git-ls-files | sed 's/^/# New file: /'
echo "#"
elif [ -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"
echo "#"
fi >.editmsg
if test "$log_message" != ''
then
echo "$log_message"
@ -144,7 +129,25 @@ then
elif test "$use_commit" != ""
then
git-cat-file commit "$use_commit" | sed -e '1,/^$/d'
fi | git-stripspace >>.editmsg
fi | git-stripspace >.editmsg
case "$signoff" in
t)
git-var GIT_COMMITTER_IDENT | sed -e '
s/>.*/>/
s/^/Signed-off-by: /
' >>.editmsg
;;
esac
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"
echo "#"
fi >>.editmsg
PARENTS="-p HEAD"
if [ ! -r "$GIT_DIR/HEAD" ]; then
@ -186,16 +189,8 @@ else
export GIT_AUTHOR_EMAIL
export GIT_AUTHOR_DATE
fi
case "$signoff" in
t)
git-var GIT_COMMITTER_IDENT | sed -e '
s/>.*/>/
s/^/Signed-off-by: /
' >>.editmsg
;;
esac
git-status-script >>.editmsg
fi
git-status-script >>.editmsg
if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
then
rm -f .editmsg

View File

@ -1,4 +1,15 @@
#!/bin/sh
#
# Copyright (c) 2005 Linus Torvalds
#
# This one uses only subdirectory-aware commands, so no need to
# include sh-setup-script.
revs=$(git-rev-parse --revs-only --no-flags --default HEAD "$@") || exit
[ "$revs" ] || die "No HEAD ref"
git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | LESS=-S ${PAGER:-less}
[ "$revs" ] || {
echo >&2 "No HEAD ref"
exit 1
}
git-rev-list --pretty $(git-rev-parse --default HEAD "$@") |
LESS=-S ${PAGER:-less}

View File

@ -39,11 +39,23 @@ esac
git-update-cache --refresh >/dev/null 2>&1
git-diff-cache -M --cached HEAD |
sed 's/^://' |
report "Updated but not checked in" "will commit"
if test -f "$GIT_DIR/HEAD"
then
git-diff-cache -M --cached HEAD |
sed 's/^://' |
report "Updated but not checked in" "will commit"
committable="$?"
committable="$?"
else
echo '#
# Initial commit
#'
git-ls-files |
sed 's/^/o o o o A /' |
report "Updated but not checked in" "will commit"
committable="$?"
fi
git-diff-files |
sed 's/^://' |