Re: [PATCH] hg-to-git: handle an empty dir in hg by combining git commits
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 5, 2007, 07:01 UTC
- Message-ID
- <7veje11v7f.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vd4tq41zt.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 15 quoted lines
> Mark Drago <markdrago@gmail.com> writes: > >> This patch will detect that there are no changes to commit (using git-status), >> and will not perform the commit, but will instead combine the log messages of >> that (non-)commit with the next commit. > > I think a better approach would be to implement --no-tree-change-is-ok > option to git-commit, strictly for use by foreign scm interface scripts > like yours. It does not usually make sense to record a commit that has > the exact same tree as its sole parent commit and that is why git-commit > prevents you from making that mistake, but when data from foreign scm is > involved, it is a different story. We are equipped to represent such a > (perhaps insane, perhaps by mistake, or perhaps done on purpose) change > and it is better to represent it bypassing the safety valve for native > use.
So I did "git commit --allow-empty". With that, perhaps the following will fix the issue?
I won't be commiting this myself until I hear a positive Ack.
--- 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 7a1c3e4..9befb92 100755 --- a/contrib/hg-to-git/hg-to-git.py +++ b/contrib/hg-to-git/hg-to-git.py @@ -211,7 +211,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 -a -F %s' % filecomment) + os.system(getgitenv(user, date) + 'git commit --allow-empty -a -F %s' % filecomment) os.unlink(filecomment) # tag