git-utilities.rb in cookbook-release-1.1.6

- old
+ new

@@ -17,11 +17,11 @@
       }
       @g = Git.open(cwd)
     end
 
     def self.git?(dir)
-      @g.index.readable?
+      !@g.nil?
     end
 
     def reset_command(new_version)
       remote = choose_remote
       "git tag -d #{new_version} ; git push #{remote} :#{new_version}"
@@ -60,16 +60,16 @@
         last = '0.1.0'
       end
       last.to_version
     end
 
-    def compute_changelog(since)
+    def compute_changelog(since, short_sha = true)
       commits = @g.log.between(since, 'HEAD').map do |commit|
         message = commit.message.lines.map(&:chomp).compact.delete_if(&:empty?)
         Commit.new(
           author: commit.author.name,
           subject: message.delete_at(0),
-          hash: commit.sha,
+          hash: short_sha ? commit.sha[0,7] : commit.sha,
           body: message.empty? ? nil : message.join('\n')
         )
       end.reject { |commit| commit[:subject] =~ /^Merge branch (.*) into/i }
     end
 