diff --git a/shell/log.sh b/shell/log.sh index 1ae47700..39e13504 100755 --- a/shell/log.sh +++ b/shell/log.sh @@ -3,12 +3,24 @@ if test -z $1 then echo 'log.sh ' else - echo 'fix:' - git log $1..HEAD --pretty=format:"- %s" --grep fix | sed 's/fix//g' - echo '\n' + FIX=`git log $1..HEAD --pretty=format:"- %s" --grep fix | sed 's/fix//g'` - echo 'feature:' - git log $1..HEAD --pretty=format:"- %s" --grep feature | sed 's/feature//g' + if test -n FIX + then + echo 'fix:' + git log $1..HEAD --pretty=format:"- %s" --grep feature | sed 's/feature//g' + fi - echo '\n\n' + FEATURE=$(git log $1..HEAD --pretty=format:"- %s" --grep feature | sed 's/feature//g') + + if test -n FEATURE + then + echo 'feature:' + git log $1..HEAD --pretty=format:"- %s" --grep feature | sed 's/feature//g' + fi + + if test -n FIX || test -z FEATURE + then + echo '\n' + fi fi