Changeset 1160

Show
Ignore:
Timestamp:
01/03/08 13:39:25 (11 months ago)
Author:
dudl..@misnomer.us
Message:

Protect Merb.svn_revision from git repositories that aren't git svn repositories.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/version.rb

    r1156 r1160  
    99    @svn_revision ||= 
    1010    if File.directory?(".git") 
    11       `git log | grep git-svn-id`.scan(/@([\d]+)\s/).first.first 
     11      revlist = `git log | grep git-svn-id`.scan(/@([\d]+)\s/) 
     12      revlist.empty? ? nil : revlist.first.first 
    1213    elsif File.directory?(".svn") 
    1314      `svn info`[/Revision: (\d+)/, 1]