diff options
| author |  Felipe Contreras <felipe.contreras@gmail.com> | 2013-04-18 01:06:31 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-17 23:41:25 -0700 |
| commit | 845241d5446c6c4be70fcaa9f7b605e7c6760181 (patch) | |
| tree | 009fc4960517c9466464d7e1fd82f3008e5d7809 | |
| parent | help.c: add a compatibility comment to cmd_version() (diff) | |
| download | tgif-845241d5446c6c4be70fcaa9f7b605e7c6760181.tar.xz | |
remote-hg: fix commit messages
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>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 328c2dc76d..45f6c80d45 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -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 = '' @@ -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 |