diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-01 11:52:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-01 11:52:40 -0700 |
| commit | 400bf4c46b2bf01cca2658c7d7b4774d7a711486 (patch) | |
| tree | 748c363a9b94d0da519ddc3bae381b102ba32c6e /contrib | |
| parent | c2980866b75229c1361b1f7a2f04c9ed197588e5 (diff) | |
| parent | 1611eed6e5071acd24b97933ac0d845db87ec7df (diff) | |
| download | git-400bf4c46b2bf01cca2658c7d7b4774d7a711486.tar.gz | |
Merge branch 'ma/hg-to-git'
* ma/hg-to-git:
hg-to-git: --allow-empty-message in git commit
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/hg-to-git/hg-to-git.py | 2 |
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 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 |