projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
diff --stat: make sure to set recursive.
[git.git]
/
git-commit.sh
diff --git
a/git-commit.sh
b/git-commit.sh
index
1e7c09e
..
01c73bd
100755
(executable)
--- a/
git-commit.sh
+++ b/
git-commit.sh
@@
-537,7
+537,7
@@
t)
;;
esac
;;
esac
-if
[ -f "$GIT_DIR/MERGE_HEAD" ]
; then
+if
test -f "$GIT_DIR/MERGE_HEAD" && test -z "$no_edit"
; then
echo "#"
echo "# It looks like you may be committing a MERGE."
echo "# If this is not correct, please remove the file"
echo "#"
echo "# It looks like you may be committing a MERGE."
echo "# If this is not correct, please remove the file"
@@
-549,8
+549,8
@@
fi >>"$GIT_DIR"/COMMIT_EDITMSG
# Author
if test '' != "$force_author"
then
# Author
if test '' != "$force_author"
then
- GIT_AUTHOR_NAME=`expr "
$force_author" : '
\(.*[^ ]\) *<.*'` &&
- GIT_AUTHOR_EMAIL=`expr "$force_author" : '.*\(<.*\)'` &&
+ GIT_AUTHOR_NAME=`expr "
z$force_author" : 'z
\(.*[^ ]\) *<.*'` &&
+ GIT_AUTHOR_EMAIL=`expr "
z
$force_author" : '.*\(<.*\)'` &&
test '' != "$GIT_AUTHOR_NAME" &&
test '' != "$GIT_AUTHOR_EMAIL" ||
die "malformatted --author parameter"
test '' != "$GIT_AUTHOR_NAME" &&
test '' != "$GIT_AUTHOR_EMAIL" ||
die "malformatted --author parameter"
@@
-605,16
+605,23
@@
else
current=
fi
current=
fi
-{
- test -z "$only_include_assumed" || echo "$only_include_assumed"
- run_status
-} >>"$GIT_DIR"/COMMIT_EDITMSG
+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
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
then
rm -f "$GIT_DIR/COMMIT_EDITMSG"
run_status
exit 1
fi
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" -a -z "$amend" ]
then
rm -f "$GIT_DIR/COMMIT_EDITMSG"
run_status
exit 1
fi
+
case "$no_edit" in
'')
case "${VISUAL:-$EDITOR},$TERM" in
case "$no_edit" in
'')
case "${VISUAL:-$EDITOR},$TERM" in