mirror of
https://github.com/gitwatch/gitwatch
synced 2024-11-15 06:12:52 +00:00
Change construction method for commit message
Instead of having a fixed structure of PREPEND+DATE+APPEND for the commit message, we now use a single commit message template string, in which the placeholder %d will be replaced by the formatted date and time (if any). This is further preparation for implementing a customizable commit message as requested in #8.
This commit is contained in:
parent
f4e77f1d04
commit
2a3ed8fdca
17
gitwatch.sh
17
gitwatch.sh
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# gitwatch - watch file or directory and git commit all changes as they happen
|
# gitwatch - watch file or directory and git commit all changes as they happen
|
||||||
#
|
#
|
||||||
# Copyright (C) 2012 Patrick Lehner
|
# Copyright (C) 2013 Patrick Lehner
|
||||||
# with modifications and contributions by:
|
# with modifications and contributions by:
|
||||||
# - Matthew McGowan
|
# - Matthew McGowan
|
||||||
# - Dominik D. Geyer
|
# - Dominik D. Geyer
|
||||||
@ -34,6 +34,7 @@ REMOTE=""
|
|||||||
BRANCH="master"
|
BRANCH="master"
|
||||||
SLEEP_TIME=2
|
SLEEP_TIME=2
|
||||||
DATE_FMT="+%Y-%m-%d %H:%M:%S"
|
DATE_FMT="+%Y-%m-%d %H:%M:%S"
|
||||||
|
COMMITMSG="Scripted auto-commit on change (%d) by gitwatch.sh"
|
||||||
|
|
||||||
shelp () { # Print a message about how to use this script
|
shelp () { # Print a message about how to use this script
|
||||||
echo "gitwatch - watch file or directory and git commit all changes as they happen"
|
echo "gitwatch - watch file or directory and git commit all changes as they happen"
|
||||||
@ -89,14 +90,6 @@ for cmd in git inotifywait; do
|
|||||||
done
|
done
|
||||||
unset cmd
|
unset cmd
|
||||||
|
|
||||||
|
|
||||||
# These two strings are used to construct the commit comment
|
|
||||||
# They're glued together like "<CCPREPEND>(<DATE&TIME>)<CCAPPEND>"
|
|
||||||
# If you don't want to add text before and/or after the date/time, simply
|
|
||||||
# set them to empty strings
|
|
||||||
CCPREPEND="Scripted auto-commit on change "
|
|
||||||
CCAPPEND=" by gitwatch.sh"
|
|
||||||
|
|
||||||
IN=$(readlink -f "$1")
|
IN=$(readlink -f "$1")
|
||||||
|
|
||||||
if [ -d $1 ]; then
|
if [ -d $1 ]; then
|
||||||
@ -117,10 +110,12 @@ fi
|
|||||||
while true; do
|
while true; do
|
||||||
$INCOMMAND # wait for changes
|
$INCOMMAND # wait for changes
|
||||||
sleep $SLEEP_TIME # wait some more seconds to give apps time to write out all changes
|
sleep $SLEEP_TIME # wait some more seconds to give apps time to write out all changes
|
||||||
DATE=$(date "$DATE_FMT") # construct date-time string
|
if [ -n "$DATE_FMT" ]; then
|
||||||
|
DATE=$(date "$DATE_FMT") # construct date-time string
|
||||||
|
fi
|
||||||
cd $TARGETDIR # CD into right dir
|
cd $TARGETDIR # CD into right dir
|
||||||
git add $GITADD # add file(s) to index
|
git add $GITADD # add file(s) to index
|
||||||
git commit $GITINCOMMAND -m"${CCPREPEND}(${DATE})${CCAPPEND}" # construct commit message and commit
|
git commit $GITINCOMMAND -m"$(sed "s/%d/$DATE/" <<< "$COMMITMSG")" # construct commit message and commit
|
||||||
|
|
||||||
if [ -n "$REMOTE" ]; then # are we pushing to a remote?
|
if [ -n "$REMOTE" ]; then # are we pushing to a remote?
|
||||||
if [ -z "$BRANCH" ]; then # Do we have a branch set to push to ?
|
if [ -z "$BRANCH" ]; then # Do we have a branch set to push to ?
|
||||||
|
Loading…
Reference in New Issue
Block a user