Merge branch 'master' into bootstrap

docs/admin/install.rst

@@ -14,7 +14,7 @@ Django (>= 1.6)
     https://www.djangoproject.com/
 Translate-toolkit (>= 1.9.0, 1.10.0 or newer strongly recommended)
     http://toolkit.translatehouse.org/
-Git (>= 1.7.2)
+Git (>= 1.6)
     http://git-scm.com/
 python-social-auth (>= 0.1.17, < 0.1.24)
     http://psa.matiasaguirre.net/

weblate/requirements.py

@@ -135,7 +135,7 @@ def get_versions():
         'Git',
         'http://git-scm.com/',
         GitRepository.get_version(),
-        '1.7.2',
+        '1.6',
     ))
 
     name = 'South'

weblate/trans/vcs.py

@@ -302,10 +302,10 @@ class GitRepository(Repository):
         Returns dictionary with detailed revision information.
         """
         text = self.execute([
-            'show',
+            'log',
+            '-1',
             '--format=fuller',
             '--date=rfc',
-            '--no-patch',
             '--abbrev-commit',
             revision
         ])
@@ -439,14 +439,11 @@ class GitRepository(Repository):
             self.execute(['remote', 'set-url', 'origin', '--push', push_url])
 
         # Set branch to track
-        try:
-            self.execute(
-                ['remote', 'set-branches', 'origin', branch]
-            )
-        except RepositoryException:
-            self.execute(
-                ['remote', 'set-branches', '--add', 'origin', branch]
-            )
+        self.execute([
+            'config',
+            'remote.origin.fetch',
+            '+refs/heads/{0}:refs/remotes/origin/{0}'.format(branch)
+        ])
 
     def configure_branch(self, branch):
         """