git/git-commit-script

#!/bin/sh
: ${GIT_DIR=.git}
PARENTS="HEAD"
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 "#"
	PARENTS="HEAD -p MERGE_HEAD"
fi > .editmsg
git-status-script >> .editmsg
if [ "$?" != "0" ]
then
	cat .editmsg
	exit 1
fi
${VISUAL:-${EDITOR:-vi}} .editmsg
grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
[ -s .cmitmsg ] || exit 1
tree=$(git-write-tree) || exit 1
commit=$(cat .cmitmsg | git-commit-tree $tree -p $PARENTS) || exit 1
echo $commit > $GIT_DIR/HEAD
rm -f -- $GIT_DIR/MERGE_HEAD
Add "commit" helper script This is meant to make raw git not hugely less usable than something like raw CVS. I want to make a 1.0 release of the plumbing, and the actual commit part was just too intimidating. 20 years ago			`#!/bin/sh`
Make "git commit" work correctly in the presense of a manual merge This has gotten only very light testing, but something like this is clearly necessary and did the right thing for the one case I threw at it. 20 years ago			`: ${GIT_DIR=.git}`
			`PARENTS="HEAD"`
			`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 "#"`
			`PARENTS="HEAD -p MERGE_HEAD"`
			`fi > .editmsg`
			`git-status-script >> .editmsg`
Add "commit" helper script This is meant to make raw git not hugely less usable than something like raw CVS. I want to make a 1.0 release of the plumbing, and the actual commit part was just too intimidating. 20 years ago			`if [ "$?" != "0" ]`
			`then`
			`cat .editmsg`
			`exit 1`
			`fi`
[PATCH] Buglets fix in the new two scripts Should be obvious... - Use $VISUAL, $EDITOR, in this order if set, and fall back on vi. - Status R, C, D, N usually are followed by number, so adjust case arms to that pattern. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org> 20 years ago			`${VISUAL:-${EDITOR:-vi}} .editmsg`
Add "commit" helper script This is meant to make raw git not hugely less usable than something like raw CVS. I want to make a 1.0 release of the plumbing, and the actual commit part was just too intimidating. 20 years ago			`grep -v '^#' < .editmsg \| git-stripspace > .cmitmsg`
			`[ -s .cmitmsg ] \|\| exit 1`
			`tree=$(git-write-tree) \|\| exit 1`
Make "git commit" work correctly in the presense of a manual merge This has gotten only very light testing, but something like this is clearly necessary and did the right thing for the one case I threw at it. 20 years ago			`commit=$(cat .cmitmsg \| git-commit-tree $tree -p $PARENTS) \|\| exit 1`
Remove MERGE_HEAD after committing merge 20 years ago			`echo $commit > $GIT_DIR/HEAD`
			`rm -f -- $GIT_DIR/MERGE_HEAD`