summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-14 17:20:14 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-14 17:20:14 (GMT)
commit96069cf03aca672e93d862813f2e7f05c1c7ac72 (patch)
treeafa7bf3964d29735f17cd4548fff29d17455b3bc
parentde4971b50076b5ef901c2ae0bbee9dd2c14f06ea (diff)
downloadgit-96069cf03aca672e93d862813f2e7f05c1c7ac72.zip
git-96069cf03aca672e93d862813f2e7f05c1c7ac72.tar.gz
git-96069cf03aca672e93d862813f2e7f05c1c7ac72.tar.bz2
Make "git commit" handle initial commits too
No need to confuse ex-CVS users with a complex initial commit sequence.
-rwxr-xr-xgit-commit-script43
1 files changed, 31 insertions, 12 deletions
diff --git a/git-commit-script b/git-commit-script
index 1abfa14..f88a51a 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -1,16 +1,35 @@
#!/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 [ ! -d $GIT_DIR ]; then
+ echo Not a git directory 1>&2
+ exit 1
+fi
+PARENTS="-p HEAD"
+if [ ! -r $GIT_DIR/HEAD ]; then
+ if [ -z "$(git-ls-files)" ]; then
+ echo Nothing to commit 1>&2
+ exit 1
+ fi
+ (
+ echo "#"
+ echo "# Initial commit"
+ echo "#"
+ git-ls-files | sed 's/^/# New file: /'
+ echo "#"
+ ) > .editmsg
+ PARENTS=""
+else
+ 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="-p HEAD -p MERGE_HEAD"
+ fi > .editmsg
+ git-status-script >> .editmsg
+fi
if [ "$?" != "0" ]
then
cat .editmsg
@@ -20,6 +39,6 @@ ${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
+commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) || exit 1
echo $commit > $GIT_DIR/HEAD
rm -f -- $GIT_DIR/MERGE_HEAD