summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurĂ­cio C Antunes <mauricio.antunes@gmail.com>2013-07-20 16:33:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-23 19:17:23 (GMT)
commit1611eed6e5071acd24b97933ac0d845db87ec7df (patch)
tree02a338574b3af5482dd68c4a8a79d9d86f396810
parent117eea7eaaeb5ecb77d9b7cebdb40b4e85f37374 (diff)
downloadgit-1611eed6e5071acd24b97933ac0d845db87ec7df.zip
git-1611eed6e5071acd24b97933ac0d845db87ec7df.tar.gz
git-1611eed6e5071acd24b97933ac0d845db87ec7df.tar.bz2
hg-to-git: --allow-empty-message in git commit
Do not fail to import mercurial commits with empty commit messages. Signed-off-by: MaurĂ­cio C Antunes <mauricio.antunes@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/hg-to-git/hg-to-git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py
index 232625a..60dec86 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