Skip to content

Commit

Permalink
remote-hg: fix commit messages
Browse files Browse the repository at this point in the history
git fast-import expects an extra newline after the commit message data,
but we are adding it only on hg-git compat mode, which is why the
bidirectionality tests pass.

We should add it unconditionally.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Felipe Contreras authored and Junio C Hamano committed Apr 18, 2013
1 parent f2de0b9 commit 845241d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion contrib/remote-helpers/git-remote-hg
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ def export_ref(repo, name, kind, head):
else:
modified, removed = get_filechanges(repo, c, parents[0])

desc += '\n'

if mode == 'hg':
extra_msg = ''

Expand All @@ -349,7 +351,6 @@ def export_ref(repo, name, kind, head):
else:
extra_msg += "extra : %s : %s\n" % (key, urllib.quote(value))

desc += '\n'
if extra_msg:
desc += '\n--HG--\n' + extra_msg

Expand Down

0 comments on commit 845241d

Please sign in to comment.