summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-22 16:55:24 -0500
committerJunio C Hamano <gitster@pobox.com>2013-04-22 15:33:37 -0700
commit160695949a074ae252a4d458a8e135fea3245681 (patch)
treedd9bfdff7f2a093c9179ed44902a878bf0da93e1
parent97253a233226b577da7c030a1f5ffe7445a25bbe (diff)
downloadgit-160695949a074ae252a4d458a8e135fea3245681.tar.gz
remote-hg: strip extra newline
There's no functional change since mercurial commit operation strips that anyway, but that's no excuse for us not to do the right thing. So let's be explicit about it. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index d0e552c0a2..fda4199a98 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -652,6 +652,10 @@ def parse_commit(parser):
if parser.check('merge'):
die('octopus merges are not supported yet')
+ # fast-export adds an extra newline
+ if data[-1] == '\n':
+ data = data[:-1]
+
files = {}
for line in parser: