[#748] Make ChiliProject::Version.revision more resilient

* Won't output errors when the ChiliProject git repo isn't there anymore, * Works even if not invoked from the ChiliProject root directory, * Moved the formatting logic to the git call.

[#748] Make ChiliProject::Version.revision more resilient
* Won't output errors when the ChiliProject git repo isn't there anymore, * Works even if not invoked from the ChiliProject root directory, * Moved the formatting logic to the git call.
d943efd0 · Felix Schäfer · 6a616a5f · d943efd0
Commit d943efd0 authored Dec 03, 2011 by Felix Schäfer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

version.rb lib/chili_project/version.rb +1 -6

No files found.
--- a/lib/chili_project/version.rb
+++ b/lib/chili_project/version.rb
@@ -38,12 +38,7 @@ module ChiliProject
    end

    def self.revision
-      revision = `git rev-parse HEAD`
-      if revision.present?
-        revision.strip[0..8]
-      else
-        nil
-      end
+      `git --git-dir="#{Rails.root.join('.git')}" rev-parse --short=9 HEAD`.chomp if File.directory? Rails.root.join('.git')
    end

    REVISION = self.revision