From 90985048fc1882483794e6734eb91401aefbe768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anssi=20K=C3=A4=C3=A4ri=C3=A4inen?= Date: Fri, 8 Jun 2012 22:52:16 +0300 Subject: [PATCH] Used git log instead of git show for last commit's timestamp The reason for this was that git show included the whole changeset in the output, but only the UTC timestamp was needed. By using git log it is possible to get just the timestamp. The whole changeset can be large, and can cause unicode encoding errors. --- django/utils/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/utils/version.py b/django/utils/version.py index 3d66b9ef52..2271d415db 100644 --- a/django/utils/version.py +++ b/django/utils/version.py @@ -40,10 +40,10 @@ def get_git_changeset(): so it's sufficient for generating the development version numbers. """ repo_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - git_show = subprocess.Popen('git show --pretty=format:%ct --quiet HEAD', + git_log = subprocess.Popen('git log --pretty=format:%ct --quiet -1 HEAD', stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, cwd=repo_dir, universal_newlines=True) - timestamp = git_show.communicate()[0].partition('\n')[0] + timestamp = git_log.communicate()[0] try: timestamp = datetime.datetime.utcfromtimestamp(int(timestamp)) except ValueError: