* [PATCH 2/2] Adds support to git-commit-script for an optional .nextmsg file.
@ 2005-06-15 5:45 Jon Seymour
0 siblings, 0 replies; only message in thread
From: Jon Seymour @ 2005-06-15 5:45 UTC (permalink / raw)
To: git; +Cc: jon.seymour
If ${GIT_DIR}/.nextmsg exists, the text will be copied into the .editmsg file
together with a sentinel line prior to invoking the editor.
After editing, the edited text (but not the status lines) are saved
back to the ${GIT_DIR}/.nextmsg file.
If the sentinel line still exists in .editmsg after editing, the
file is truncated, thereby causing the commit to abort (per previous
behaviour).
The ${GIT_DIR}/.nextmsg file is deleted if, and only if,
the commit was successful.
The behaviour of git-commit-script is unchanged with respect to the
previous versions if ${GIT_DIR}/.nextmsg does not exist.
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
This patch set is a complete replacement for:
[PATCH 1/1] Add support for an optional .nextmsg file to git-commit-script
I have incorporated most of Junio's feedback, except the prompting
suggestion and the suggested restructuring is slightly different.
---
git-commit-script | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/git-commit-script b/git-commit-script
--- a/git-commit-script
+++ b/git-commit-script
@@ -5,7 +5,7 @@ print_status() {
if [ -z "$(git-ls-files)" ]; then
echo Nothing to commit 1>&2
return 1
- fi
+ fi
cat <<EOF
#
# Initial commit
@@ -26,12 +26,41 @@ EOF
git-status-script
}
+merge_next_message()
+{
+ status=$1
+ next=$2
+ mv -f $status .status.$$ || exit 1
+ cat >$status <<EOF
+$SENTINEL
+#---
+$(cat $next)
+#---
+$(cat .status.$$)
+EOF
+ rm .status.$$
+}
+
+save_next_message()
+{
+ status=$1
+ next=$2
+ if grep "^$SENTINEL" < $status >/dev/null; then
+ :> $status
+ echo "commit aborted - you must delete the SENTINEL line to confirm the commit"
+ fi
+ grep -v "^#" < $status > $next
+}
+
edit_message() {
status=$1
msg=$2
+ next=$3
:> $msg
+ [ -f "$next" ] && merge_next_message "$status" "$next"
${VISUAL:-${EDITOR:-vi}} "$status"
+ [ -f "$next" ] && save_next_message "$status" "$next"
grep -v '^#' < $status | git-stripspace >$msg
[ -s $msg ]
return $?
@@ -67,8 +96,9 @@ if ! print_status > .editmsg; then
exit 1
fi
-if edit_message .editmsg .cmitmsg; then
+if edit_message .editmsg .cmitmsg ${GIT_DIR}/.nextmsg ; then
exec_commit .cmitmsg
[ -f .editmsg ] && rm .editmsg
[ -f .cmitmsg ] && rm .cmitmsg
+ [ -f .nextmsg ] && rm .nextmsg
fi
------------
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-06-15 5:41 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-06-15 5:45 [PATCH 2/2] Adds support to git-commit-script for an optional .nextmsg file 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).