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

Merge branch 'master'

Browse Source 
* master:
  Define GIT_(AUTHOR|COMMITTER)_(NAME|EMAIL) to known values.
  Merge branch 'lt/diff-tree'
  git-commit -v: have patch at the end.
This commit is contained in:
Junio C Hamano 2006-02-10 19:12:57 -08:00
commit 69c57a8d87
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
git-commit.sh
View File

@ -87,24 +87,13 @@ run_status () {
if test -z "$initial_commit" if test -z "$initial_commit"
then then
if test -z "$verbose" git-diff-index -M --cached --name-status \
then --diff-filter=MDTCRA HEAD |
git-diff-index -M --cached --name-status \ sed -e '
--diff-filter=MDTCRA HEAD | s/\\/\\\\/g
sed -e ' s/ /\\ /g
s/\\/\\\\/g ' |
s/ /\\ /g report "Updated but not checked in" "will commit"
' |
report "Updated but not checked in" "will commit"
else
if git-diff-index --cached -M -p --diff-filter=MDTCRA HEAD |
grep .
then
false
else
true
fi
fi
committable="$?" committable="$?"
else else
echo '# echo '#
@ -155,6 +144,11 @@ run_status () {
print "$_\n"; print "$_\n";
} }
' '
if test -n "$verbose"
then
git-diff-index --cached -M -p --diff-filter=MDTCRA HEAD
fi
case "$committable" in case "$committable" in
0) 0)
echo "nothing to commit" echo "nothing to commit"
@ -578,10 +572,7 @@ else
PARENTS="" PARENTS=""
fi fi
{ run_status >>"$GIT_DIR"/COMMIT_EDITMSG
test -z "$verbose" || echo '---'
run_status
} >>"$GIT_DIR"/COMMIT_EDITMSG
if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ] if [ "$?" != "0" -a ! -f "$GIT_DIR/MERGE_HEAD" ]
then then
rm -f "$GIT_DIR/COMMIT_EDITMSG" rm -f "$GIT_DIR/COMMIT_EDITMSG"
@ -612,11 +603,11 @@ t)
esac esac
sed -e ' sed -e '
/^---$/{ /^diff --git a\/.*/{
s/// s///
q q
} }
/^#/d /^#/d
' "$GIT_DIR"/COMMIT_EDITMSG | ' "$GIT_DIR"/COMMIT_EDITMSG |
git-stripspace >"$GIT_DIR"/COMMIT_MSG git-stripspace >"$GIT_DIR"/COMMIT_MSG

10
t/test-lib.sh
View File

@ -16,11 +16,11 @@ unset COMMIT_AUTHOR_EMAIL
unset COMMIT_AUTHOR_NAME unset COMMIT_AUTHOR_NAME
unset GIT_ALTERNATE_OBJECT_DIRECTORIES unset GIT_ALTERNATE_OBJECT_DIRECTORIES
unset GIT_AUTHOR_DATE unset GIT_AUTHOR_DATE
unset GIT_AUTHOR_EMAIL GIT_AUTHOR_EMAIL=author@example.com
unset GIT_AUTHOR_NAME GIT_AUTHOR_NAME='A U Thor'
unset GIT_COMMITTER_DATE unset GIT_COMMITTER_DATE
unset GIT_COMMITTER_EMAIL GIT_COMMITTER_EMAIL=committer@example.com
unset GIT_COMMITTER_NAME GIT_COMMITTER_NAME='C O Mitter'
unset GIT_DIFF_OPTS unset GIT_DIFF_OPTS
unset GIT_DIR unset GIT_DIR
unset GIT_EXTERNAL_DIFF unset GIT_EXTERNAL_DIFF
@ -28,6 +28,8 @@ unset GIT_INDEX_FILE
unset GIT_OBJECT_DIRECTORY unset GIT_OBJECT_DIRECTORY
unset SHA1_FILE_DIRECTORIES unset SHA1_FILE_DIRECTORIES
unset SHA1_FILE_DIRECTORY unset SHA1_FILE_DIRECTORY
export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
# Each test should start with something like this, after copyright notices: # Each test should start with something like this, after copyright notices:
# #