Download as
Browse Code »

Commit 71178d9a6a3b4162ab6db68b5aeb8353f2474f8e

Authored by Antonio Terceiro
1 parent dbaa5364
Exists in master and in 9 other branches angular_poc, backup-7-jan-2016, export-comment-paragraph, login-captcha, new_video_plugin, refactor_with_role, staging, theme-brasil-digital-from-staging, travis

Noosfero::VERSION: avoid git warning on shallow clones 

`git describe` will not be able to describe the HEAD commit in shallow
clones, which will most probably not contain any tags.
Showing 1 changed file with 11 additions and 9 deletions   Show diff stats
lib/noosfero/version.rb
  Diff comments   View file @71178d9
... ... @@ -5,14 +5,16 @@ end
5 5  
6 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
7 7 if File.exist?(File.join(root, '.git')) && system('which git >/dev/null')
8   - git_version = Dir.chdir(root) { `git describe --tags`.to_s.strip.sub('-rc', '~rc') }
9   - version_sort = IO.popen(['sort', '--version-sort'], 'w+')
10   - version_sort.puts(Noosfero::VERSION)
11   - version_sort.puts(git_version)
12   - version_sort.close_write
13   - new_version = version_sort.readlines.last.strip
14   - if new_version != Noosfero::VERSION
15   - Noosfero::VERSION.clear << git_version
  8 + git_version = Dir.chdir(root) { `git describe --tags 2>/dev/null`.to_s.strip.sub('-rc', '~rc') }
  9 + if git_version != ''
  10 + version_sort = IO.popen(['sort', '--version-sort'], 'w+')
  11 + version_sort.puts(Noosfero::VERSION)
  12 + version_sort.puts(git_version)
  13 + version_sort.close_write
  14 + new_version = version_sort.readlines.last.strip
  15 + if new_version != Noosfero::VERSION
  16 + Noosfero::VERSION.clear << git_version
  17 + end
  18 + version_sort.close
16 19 end
17   - version_sort.close
18 20 end
... ...