Felipe Contreras <felipe.contre...@gmail.com> writes: > 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.contre...@gmail.com> > ---
Without knowing that hg-git compat mode is what is used in bidi test (the only mode that supports bidi), "which is why" was ungrokkable. This is a trivial change without downside risk so I do not mind applying it to 'maint', as you say it is an appropriate there. > contrib/remote-helpers/git-remote-hg | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/contrib/remote-helpers/git-remote-hg > b/contrib/remote-helpers/git-remote-hg > index a5f0013..5481331 100755 > --- a/contrib/remote-helpers/git-remote-hg > +++ b/contrib/remote-helpers/git-remote-hg > @@ -362,6 +362,8 @@ def export_ref(repo, name, kind, head): > else: > modified, removed = get_filechanges(repo, c, parents[0]) > > + desc += '\n' > + > if mode == 'hg': > extra_msg = '' > > @@ -385,7 +387,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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
