projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fetch.c: do not pass uninitialized lock to unlock_ref().
[git.git]
/
git-commit.sh
diff --git
a/git-commit.sh
b/git-commit.sh
index
26cd7ca
..
0a01a0b
100755
(executable)
--- a/
git-commit.sh
+++ b/
git-commit.sh
@@
-3,7
+3,7
@@
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2006 Junio C Hamano
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2006 Junio C Hamano
-USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>
)
[--amend] [-e] [--author <author>] [[-i | -o] <path>...]'
+USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>
] [-u]
[--amend] [-e] [--author <author>] [[-i | -o] <path>...]'
SUBDIRECTORY_OK=Yes
. git-sh-setup
SUBDIRECTORY_OK=Yes
. git-sh-setup
@@
-134,13
+134,17
@@
run_status () {
report "Changed but not updated" \
"use git-update-index to mark for commit"
report "Changed but not updated" \
"use git-update-index to mark for commit"
+ option=""
+ if test -z "$untracked_files"; then
+ option="--directory --no-empty-directory"
+ fi
if test -f "$GIT_DIR/info/exclude"
then
if test -f "$GIT_DIR/info/exclude"
then
- git-ls-files -z --others
--directory
\
+ git-ls-files -z --others
$option
\
--exclude-from="$GIT_DIR/info/exclude" \
--exclude-per-directory=.gitignore
else
--exclude-from="$GIT_DIR/info/exclude" \
--exclude-per-directory=.gitignore
else
- git-ls-files -z --others
--directory
\
+ git-ls-files -z --others
$option
\
--exclude-per-directory=.gitignore
fi |
perl -e '$/ = "\0";
--exclude-per-directory=.gitignore
fi |
perl -e '$/ = "\0";
@@
-203,6
+207,7
@@
verbose=
signoff=
force_author=
only_include_assumed=
signoff=
force_author=
only_include_assumed=
+untracked_files=
while case "$#" in 0) break;; esac
do
case "$1" in
while case "$#" in 0) break;; esac
do
case "$1" in
@@
-340,6
+345,12
@@
do
verbose=t
shift
;;
verbose=t
shift
;;
+ -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
+ ;;
--)
shift
break
--)
shift
break
@@
-640,6
+651,8
@@
case "$no_edit" in
exit 1
;;
esac
exit 1
;;
esac
+ git-var GIT_AUTHOR_IDENT > /dev/null || die
+ git-var GIT_COMMITTER_IDENT > /dev/null || die
${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
;;
esac
${VISUAL:-${EDITOR:-vi}} "$GIT_DIR/COMMIT_EDITMSG"
;;
esac
@@
-674,7
+687,8
@@
then
rm -f "$TMP_INDEX"
fi &&
commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
rm -f "$TMP_INDEX"
fi &&
commit=$(cat "$GIT_DIR"/COMMIT_MSG | git-commit-tree $tree $PARENTS) &&
- git-update-ref HEAD $commit $current &&
+ rlogm=$(sed -e 1q "$GIT_DIR"/COMMIT_MSG) &&
+ git-update-ref -m "commit: $rlogm" HEAD $commit $current &&
rm -f -- "$GIT_DIR/MERGE_HEAD" &&
if test -f "$NEXT_INDEX"
then
rm -f -- "$GIT_DIR/MERGE_HEAD" &&
if test -f "$NEXT_INDEX"
then