From daf22cd3271cebeb5742a064c0de5e91d59f8ea1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 21 Jan 2013 22:41:31 +0000 Subject: [PATCH] fix git-svn version extraction for local git branches git-svn-id: svn://localhost/ardour2/branches/3.0@13962 d708f5d6-7413-0410-9779-e7cbd77b26cf --- wscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 92b6383fef..21b283b072 100644 --- a/wscript +++ b/wscript @@ -69,10 +69,12 @@ def fetch_gcc_version (CC): return version def fetch_git_revision (path): - cmd = "LANG= git log --abbrev HEAD^..HEAD " + path + cmd = "LANG= git log --abbrev HEAD^..HEAD" output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() o = output[0].decode('utf-8') rev = o.replace ("commit", "git")[0:10] + cmd = "LANG= git log --abbrev -n1 --grep 'git-svn-id'" + output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines() for line in output: try: if "git-svn-id" in line: