Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ma/hg-to-git'
author
Junio C Hamano
<gitster@pobox.com>
Thu, 1 Aug 2013 18:52:40 +0000
(11:52 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 1 Aug 2013 18:52:40 +0000
(11:52 -0700)
* ma/hg-to-git:
hg-to-git: --allow-empty-message in git commit
contrib/hg-to-git/hg-to-git.py
patch
|
blob
|
history
raw
(from parent 1:
c298086
)
diff --git
a/contrib/hg-to-git/hg-to-git.py
b/contrib/hg-to-git/hg-to-git.py
index 232625a7b72aef88ef9cc0285eb7208ce38a2138..60dec86d37efbffb557e611cde4bf2b2dbfbf478 100755
(executable)
--- 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