* [PATCH 1/2] Reorganization of git-commit-script [rev 3]
@ 2005-06-15 7:35 Jon Seymour
2005-06-15 8:05 ` [WITHDRAWN PATCH] Reorganization of git-commit-script [rev 3] etc Jon Seymour
0 siblings, 1 reply; 2+ messages in thread
From: Jon Seymour @ 2005-06-15 7:35 UTC (permalink / raw)
To: git; +Cc: jon.seymour
This change re-organizes git-commit-script to break out
the different phases of execution into separate bash
functions.
The main body is now:
if ! print_status > .editmsg; then
# error handling
fi
if edit_message .editmsg .cmitmsg; then
exec_commit .cmitmsg
# cleanup
fi
The subsequent patch in this series adds support for
an optional .nextmsg file to enable the pre-population
of commit message text by external tools.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
[rev 3] - oops, sorry, forgot to test merge case
---
git-commit-script | 100 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 65 insertions(+), 35 deletions(-)
diff --git a/git-commit-script b/git-commit-script
old mode 100644
new mode 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -1,44 +1,74 @@
#!/bin/sh
+
+print_status() {
+ if [ ! -r $GIT_DIR/HEAD ]; then
+ if [ -z "$(git-ls-files)" ]; then
+ echo Nothing to commit 1>&2
+ return 1
+ fi
+cat <<EOF
+#
+# Initial commit
+#
+$(git-ls-files | sed s/^/# New file: )
+#
+EOF
+ elif [ -f $GIT_DIR/MERGE_HEAD ]; then
+cat <<EOF
+#
+# It looks like your may be committing a MERGE.
+# If this is not correct, please remove the file
+# $GIT_DIR/MERGE_HEAD
+# and try again
+#
+EOF
+ fi
+ git-status-script
+}
+
+edit_message() {
+ status=$1
+ msg=$2
+
+ :> $msg
+ ${VISUAL:-${EDITOR:-vi}} "$status"
+ grep -v '^#' < $status | git-stripspace >$msg
+ [ -s $msg ]
+ return $?
+}
+
+commit_parents() {
+ [ -f $GIT_DIR/HEAD ] &&
+ echo -n "-p HEAD" &&
+ [ -f $GIT_DIR/MERGE_HEAD ] &&
+ echo -n " -p MERGE_HEAD"
+ echo ""
+}
+
+exec_commit() {
+ msg=$1
+ tree=$(git-write-tree) || exit 1
+ parents=$(commit_parents) || exit 1
+ commit=$(cat $msg | git-commit-tree $tree $parents) || exit 1
+ echo $commit > $GIT_DIR/HEAD
+ rm -f -- $GIT_DIR/MERGE_HEAD
+}
+
+SENTINEL="#SENTINEL - delete this line to confirm the commit"
: ${GIT_DIR=.git}
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
+
+if ! print_status > .editmsg; then
cat .editmsg
+ rm .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 $PARENTS) || exit 1
-echo $commit > $GIT_DIR/HEAD
-rm -f -- $GIT_DIR/MERGE_HEAD
+
+if edit_message .editmsg .cmitmsg; then
+ exec_commit .cmitmsg
+ [ -f .editmsg ] && rm .editmsg
+ [ -f .cmitmsg ] && rm .cmitmsg
+fi
------------
^ permalink raw reply [flat|nested] 2+ messages in thread
* [WITHDRAWN PATCH] Reorganization of git-commit-script [rev 3] etc..
2005-06-15 7:35 [PATCH 1/2] Reorganization of git-commit-script [rev 3] Jon Seymour
@ 2005-06-15 8:05 ` Jon Seymour
0 siblings, 0 replies; 2+ messages in thread
From: Jon Seymour @ 2005-06-15 8:05 UTC (permalink / raw)
To: git; +Cc: jon.seymour
Sorry,
I really didn't test these too well.
I'll withdrawn them until I have tested them properly (with test cases).
jon.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-06-15 8:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-06-15 7:35 [PATCH 1/2] Reorganization of git-commit-script [rev 3] Jon Seymour
2005-06-15 8:05 ` [WITHDRAWN PATCH] Reorganization of git-commit-script [rev 3] etc Jon Seymour
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).