Merge branch 'ma/hg-to-git'

* ma/hg-to-git: hg-to-git: --allow-empty-message in git commit
git-mirror · Aug 1, 2013 · 400bf4c · 400bf4c
2 parents c298086 + 1611eed
commit 400bf4c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py
@@ -225,7 +225,7 @@ def getgitenv(user, date):
     os.system('git ls-files -x .hg --deleted | git update-index --remove --stdin')
 
     # commit
-    os.system(getgitenv(user, date) + 'git commit --allow-empty -a -F %s' % filecomment)
+    os.system(getgitenv(user, date) + 'git commit --allow-empty --allow-empty-message -a -F %s' % filecomment)
     os.unlink(filecomment)
 
     # tag