Merge 0f05845 into 23172f3

README.md

@@ -29,6 +29,16 @@ template = env.from_string('Commit is: {% gitcommit %}')
 # => Commit is: c644682f4899d7e98147ce3a61a11bb13c52b3a0
 ```
 
+Or short version:
+
+```python
+from jinja2 import Environment
+
+env = Environment(extensions=['jinja2_git.GitExtension'])
+template = env.from_string('Commit is: {% gitcommit short=True %}')
+# => Commit is: c644682
+```
+
 ## Installation
 
 ```bash

jinja2_git.py

@@ -11,14 +11,27 @@ class GitExtension(Extension):
 
     tags = {'gitcommit'}
 
-    def _commit_hash(self):
-        output = subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+    def _commit_hash(self, *args):
+        if args[0]:
+            output = subprocess.check_output(['git',
+                                              'rev-parse',
+                                              '--short',
+                                              'HEAD',
+                                              ])
+        else:
+            output = subprocess.check_output(['git', 'rev-parse', 'HEAD'])
         return output.decode('utf-8').strip()
 
     def parse(self, parser):
         """Main method to render data into the template."""
         lineno = next(parser.stream).lineno
 
-        # TODO: add {% gitcommit 'short' %} feature
-        result = self.call_method('_commit_hash', [], lineno=lineno)
+        if parser.stream.skip_if('name:short'):
+            parser.stream.skip(1)
+            short = parser.parse_expression()
+        else:
+            short = nodes.Const(False)
+
+        args = [short]
+        result = self.call_method('_commit_hash', args, [], lineno=lineno)
         return nodes.Output([result], lineno=lineno)

tests/test_gitcommit.py

@@ -9,6 +9,12 @@ def test_commit_length(environment):
     assert len(template.render()) == 40
 
 
+def test_short_commit_length(environment):
+    template = environment.from_string('{% gitcommit short=True %}')
+
+    assert len(template.render()) == 7
+
+
 def test_is_commit(environment):
     template = environment.from_string('{% gitcommit %}')
     output = subprocess.check_output(