Merge pull request #172 from artem-dev/new_git_version

nicer deploy versions for git repos if tags are available
2012-09-21 07:39:47 -07:00 · 2012-09-21 07:39:47 -07:00 · a6eacf2c9b
parent b46b5a6ef0 7685cb14a4
commit a6eacf2c9b
1 changed files with 1 additions and 1 deletions
--- a/scrapy/commands/deploy.py
+++ b/scrapy/commands/deploy.py
@ -150,7 +150,7 @@ def _get_version(target, opts):
        p = Popen(['hg', 'tip', '--template', '{rev}'], stdout=PIPE)
        return 'r%s' % p.communicate()[0]
    elif version == 'GIT':
-        p = Popen(['git', 'rev-parse', 'HEAD'], stdout=PIPE)
+        p = Popen(['git', 'describe', '--always'], stdout=PIPE)
        return '%s' % p.communicate()[0].strip('\n')
    elif version:
        return version