From 1611eed6e5071acd24b97933ac0d845db87ec7df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Maur=C3=ADcio=20C=20Antunes?= Date: Sat, 20 Jul 2013 13:33:20 -0300 Subject: [PATCH] hg-to-git: --allow-empty-message in git commit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Do not fail to import mercurial commits with empty commit messages. Signed-off-by: Maurício C Antunes Signed-off-by: Junio C Hamano --- contrib/hg-to-git/hg-to-git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py index 232625a7b7..60dec86d37 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -225,7 +225,7 @@ for cset in range(int(tip) + 1): 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 -- 2.11.4.GIT