Commit Diff

Commit:
4fdab84f49d3b70a287a1a2d2bb9f589f96e252f
From:
Colin Leroy <colin@colino.net>
Date:
Message:
let the user edit the whole Changelog entry
Actions:
Patch | Tree
commit - 6fbc6aaae2a2c56db9875e14f299839a748548a8
commit + 4fdab84f49d3b70a287a1a2d2bb9f589f96e252f
blob - 14f7518e3de0cd54fce274ed33c6956375b86c6a
blob + f6370c26ba2524ad3dd4d541b52efd2e38314891
--- commitHelper
+++ commitHelper
@@ -73,14 +73,14 @@ if [ "$EDITOR" == "" ]; then
 	EDITOR=vi
 fi;
 
-if [ -n "/tmp/logentry" ]; then
-	echo -e "\n#please type in the changelog entry" > /tmp/logentry
-fi;
+
+echo -e "#please complete the changelog entry below" > /tmp/logentry
+echo -e -n $log >> /tmp/logentry
+
 $EDITOR /tmp/logentry
 
 echo "--8<----------"
-echo -e -n $log
-grep -v "^#" /tmp/logentry |grep -v "^$" | sed "s/^/		/" > /tmp/log.tmp.$$ \
+grep -v "^#" /tmp/logentry > /tmp/log.tmp.$$ \
 && mv /tmp/log.tmp.$$ /tmp/logentry
 echo >> /tmp/logentry
 cat /tmp/logentry
@@ -97,8 +97,7 @@ echo -n "Is it ok (write to $chlog and update configur
 read ans
 if [ "$ans" == "y" ]; then
 	mv $chlog $chlog.old
-	echo -e -n $log > $chlog
-	cat /tmp/logentry >> $chlog
+	cat /tmp/logentry > $chlog
 	cat $chlog.old >> $chlog
 	rm $chlog.old