b25lIG1vcmUgZXJyb3IgaGFuZGxlcgo=

This commit is contained in:
lovelywcm 2010-04-18 07:56:48 +00:00
parent 29f8b91814
commit 03afb5b2a2

View File

@ -80,10 +80,15 @@ if [ "$convertedLog" != "" ]; then
echo -e $convertedLog | git commit -a -F - && echo -e $convertedLog | git commit -a -F - &&
[ -s temp.patch ] && git apply temp.patch && [ -s temp.patch ] && git apply temp.patch &&
rm temp.patch && rm temp.patch;
# remove (if exist) empty temp.patch if [ -s temp.patch ]; then
[ ! -s temp.patch -a -e temp.patch ] && rm temp.patch; echo "Error: git apply failed, your work saved at temp.patch";
exit 1;
elif [ -a temp.patch ]; then
# empty, remove it
rm temp.patch;
fi
fi fi
if [ "$(git diff)" == "" ]; then if [ "$(git diff)" == "" ]; then