Don't fail to build when we're on a merge commit.

1 files changed, 2 insertions, 0 deletions

diff --git a/wscript b/wscript
index c55395c26..eda44b52e 100644
--- a/wscript
+++ b/wscript
@@ -560,6 +560,8 @@ def git_revision():
 
     cmd = "LANG= git log --abbrev HEAD^..HEAD ."
     output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+    if len(output) == 0:
+        return None
     o = output[0].decode('utf-8')
     return o.replace("commit ", "")[0:10]