0
@@ -53,12 +53,6 @@ END
0
   require 'rake/gempackagetask'
0
   require 'lib/haml'
0
 
0
-  # Before we run the package task,
0
-  # we want to create a REVISION file
0
-  # if we've checked out Haml from git
0
-  # and we aren't building for a release.
0
-  create_revision = Haml.version[:rev] && !Rake.application.top_level_tasks.include?('release')
0
-
0
   spec = Gem::Specification.new do |spec|
0
     spec.name = 'haml'
0
     spec.summary = "An elegant, structured XHTML/XML templating engine.\nComes with Sass, a similar CSS templating engine."
0
@@ -79,9 +73,9 @@ END
0
     readmes = FileList.new('*') do |list|
0
       list.exclude(/(^|[^.a-z])[a-z]+/)
0
       list.exclude('TODO')
0
+      list.include('REVISION')
0
     end.to_a
0
     spec.executables = ['haml', 'html2haml', 'sass', 'css2sass']
0
-    readmes << 'REVISION' if create_revision
0
     spec.files = FileList['lib/**/*', 'bin/*', 'test/**/*', 'Rakefile', 'init.rb'].to_a + readmes
0
     spec.autorequire = ['haml', 'sass']
0
     spec.homepage = 'http://haml.hamptoncatlin.com/'
0
@@ -105,7 +99,13 @@ END
0
 
0
   desc "This is an internal task."
0
   task :revision_file do
0
-    File.open('REVISION', 'w') { |f| f.puts Haml.version[:rev] } if create_revision
0
+    if Haml.version[:rev] && !Rake.application.top_level_tasks.include?('release')
0
+      File.open('REVISION', 'w') { |f| f.puts Haml.version[:rev] }
0
+    elsif Rake.application.top_level_tasks.include?('release')
0
+      File.open('REVISION', 'w') { |f| f.puts "(release)" }
0
+    else
0
+      File.open('REVISION', 'w') { |f| f.puts "(unknown)" }
0
+    end
0
   end
0
   Rake::Task[:package].prerequisites.insert(0, :revision_file)
0
 

0
@@ -937,7 +937,10 @@ module Haml
0
 
0
     if File.exists?(scope('REVISION'))
0
       rev = File.read(scope('REVISION')).strip
0
-    elsif File.exists?(scope('.git/HEAD'))
0
+      rev = nil if rev !~ /a-f0-9+/
0
+    end
0
+
0
+    if rev.nil? && File.exists?(scope('.git/HEAD'))
0
       rev = File.read(scope('.git/HEAD')).strip
0
       if rev =~ /^ref: (.*)$/
0
         rev = File.read(scope(".git/#{$1}")).strip