]> git.ipfire.org Git - thirdparty/git.git/blob - git-commit-script
Clean up MERGE_HEAD and ORIG_HEAD also for the trivial fast-forward merges.
[thirdparty/git.git] / git-commit-script
1 #!/bin/sh
2 : ${GIT_DIR=.git}
3 if [ ! -d $GIT_DIR ]; then
4 echo Not a git directory 1>&2
5 exit 1
6 fi
7 PARENTS="-p HEAD"
8 if [ ! -r $GIT_DIR/HEAD ]; then
9 if [ -z "$(git-ls-files)" ]; then
10 echo Nothing to commit 1>&2
11 exit 1
12 fi
13 (
14 echo "#"
15 echo "# Initial commit"
16 echo "#"
17 git-ls-files | sed 's/^/# New file: /'
18 echo "#"
19 ) > .editmsg
20 PARENTS=""
21 else
22 if [ -f $GIT_DIR/MERGE_HEAD ]; then
23 echo "#"
24 echo "# It looks like your may be committing a MERGE."
25 echo "# If this is not correct, please remove the file"
26 echo "# $GIT_DIR/MERGE_HEAD"
27 echo "# and try again"
28 echo "#"
29 PARENTS="-p HEAD -p MERGE_HEAD"
30 fi > .editmsg
31 git-status-script >> .editmsg
32 fi
33 if [ "$?" != "0" ]
34 then
35 cat .editmsg
36 exit 1
37 fi
38 ${VISUAL:-${EDITOR:-vi}} .editmsg
39 grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
40 [ -s .cmitmsg ] || exit 1
41 tree=$(git-write-tree) || exit 1
42 commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) || exit 1
43 echo $commit > $GIT_DIR/HEAD
44 rm -f -- $GIT_DIR/MERGE_HEAD