lib/caretaker.rb in caretaker-0.8.2 vs lib/caretaker.rb in caretaker-0.8.3

@@ -20,10 +20,11 @@
     def initialize(options = {})
         #
         # Global variables
         #
         @name = 'Caretaker'
+        @url = 'https://github.com/DevelopersToolbox/caretaker'
         @executable = 'caretaker'
         @config_file = '.caretaker.yml'
         @default_category = 'Uncategorised:'
         @github_base_url = 'https://github.com'
         @spinner_format = :classic
@@ -359,13 +360,11 @@
                 a[:subject] = process_subject(a[:subject], a[:hash], a[:hash_full], first)
                 category = get_category(a[:subject]).to_s
 
                 next if category == 'Skip:'
 
-                if @enable_categories || @remove_categories
-                    a[:subject] = a[:subject].sub(/.*?:/, '').strip if category != @default_category
-                end
+                a[:subject] = a[:subject].sub(/.*?:/, '').strip if (@enable_categories || @remove_categories) && (category != @default_category)
 
                 next if count_words(a[:subject]) < @min_words
 
                 if @enable_categories
                     (processed[tag.to_s][category.to_s] ||= []) << a
@@ -427,11 +426,11 @@
             @changelog += "All notable changes to this project will be documented in this file.\n\n"
         else
             @changelog += contents
         end
 
-        @changelog += "\nThis changelog was automatically generated using [#{@name}](#{@repository_remote_url}) by [Wolf Software](https://github.com/WolfSoftware)\n\n"
+        @changelog += "\nThis changelog was automatically generated using [#{@name}](#{@url}) by [Wolf Software](https://github.com/WolfSoftware)\n\n"
     end
 
     #
     # Write a version header and release date
     #
@@ -645,10 +644,10 @@
 
 res=$(git status --porcelain | grep -c "${OUTPUT_FILE}")
 if [[ "${res}" -gt 0 ]]; then
 
     git add "${OUTPUT_FILE}" >> /dev/null 2>&1
-    git commit --amend --no-edit >> /dev/null 2>&1
+    git commit --amend --no-edit --no-verify >> /dev/null 2>&1
 
     if [[ -n "${RELEASE_VERSION}" ]]; then
         git tag -f "${TAG_NAME}"
     fi