[PATCH] git-commit-script: get commit message from an existing one.
With -m flag specified, git-commit-script takes the commit
message along with author information from an existing commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/git-commit-script b/git-commit-script
index 57f5333..2632afd 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -1,12 +1,37 @@
#!/bin/sh
+#
+# Copyright (c) 2005 Linus Torvalds
+#
+
+usage () {
+ echo 'git commit [-m existing-commit] [<path>...]'
+ exit 1
+}
+
: ${GIT_DIR=.git}
-if [ ! -d $GIT_DIR ]; then
+if [ ! -d "$GIT_DIR" ]; then
echo Not a git directory 1>&2
exit 1
fi
+while case "$#" in 0) break ;; esac
+do
+ case "$1" in
+ -m) shift
+ case "$#" in
+ 0) usage ;;
+ *) use_commit=`git-rev-parse "$1"` ||
+ exit ;;
+ esac
+ ;;
+ *) break
+ ;;
+ esac
+ shift
+done
+
git-update-cache -q --refresh -- "$@" || exit 1
PARENTS="-p HEAD"
-if [ ! -r $GIT_DIR/HEAD ]; then
+if [ ! -r "$GIT_DIR/HEAD" ]; then
if [ -z "$(git-ls-files)" ]; then
echo Nothing to commit 1>&2
exit 1
@@ -20,7 +45,7 @@
) > .editmsg
PARENTS=""
else
- if [ -f $GIT_DIR/MERGE_HEAD ]; then
+ 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"
@@ -28,8 +53,38 @@
echo "# and try again"
echo "#"
PARENTS="-p HEAD -p MERGE_HEAD"
- fi > .editmsg
- git-status-script >> .editmsg
+ elif test "$use_commit" != ""
+ then
+ pick_author_script='
+ /^author /{
+ h
+ s/^author \([^<]*\) <[^>]*> .*$/\1/
+ s/'\''/'\''\'\'\''/g
+ s/.*/GIT_AUTHOR_NAME='\''&'\''/p
+
+ g
+ s/^author [^<]* <\([^>]*\)> .*$/\1/
+ s/'\''/'\''\'\'\''/g
+ s/.*/GIT_AUTHOR_EMAIL='\''&'\''/p
+
+ g
+ s/^author [^<]* <[^>]*> \(.*\)$/\1/
+ s/'\''/'\''\'\'\''/g
+ s/.*/GIT_AUTHOR_DATE='\''&'\''/p
+
+ q
+ }
+ '
+ set_author_env=`git-cat-file commit "$use_commit" |
+ sed -ne "$pick_author_script"`
+ eval "$set_author_env"
+ export GIT_AUTHOR_NAME
+ export GIT_AUTHOR_EMAIL
+ export GIT_AUTHOR_DATE
+ git-cat-file commit "$use_commit" |
+ sed -e '1,/^$/d'
+ fi >.editmsg
+ git-status-script >>.editmsg
fi
if [ "$?" != "0" ]
then
@@ -37,13 +92,17 @@
rm .editmsg
exit 1
fi
-${VISUAL:-${EDITOR:-vi}} .editmsg
+case "$use_commit" in
+'')
+ ${VISUAL:-${EDITOR:-vi}} .editmsg
+ ;;
+esac
grep -v '^#' < .editmsg | git-stripspace > .cmitmsg
[ -s .cmitmsg ] &&
tree=$(git-write-tree) &&
commit=$(cat .cmitmsg | git-commit-tree $tree $PARENTS) &&
- echo $commit > $GIT_DIR/HEAD &&
- rm -f -- $GIT_DIR/MERGE_HEAD
+ echo $commit > "$GIT_DIR/HEAD" &&
+ rm -f -- "$GIT_DIR/MERGE_HEAD"
ret="$?"
rm -f .cmitmsg .editmsg
exit "$ret"
