summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Contreras <felipe.contreras@gmail.com>2013-04-26 21:12:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-26 22:20:27 (GMT)
commit877ee9cc7eec7f1cf43d726f6a92c20fdfe83ca9 (patch)
tree0c0f64779db954b9c4150e2a54493c01f270b66f
parent4d74cd4725da4b575baf2dc20ebee18d49885c4e (diff)
downloadgit-877ee9cc7eec7f1cf43d726f6a92c20fdfe83ca9.zip
git-877ee9cc7eec7f1cf43d726f6a92c20fdfe83ca9.tar.gz
git-877ee9cc7eec7f1cf43d726f6a92c20fdfe83ca9.tar.bz2
remote-bzr: strip extra newline
It's added by fast-export, the user didn't type 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-bzr4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 6ccca8e..c19ed0e 100755
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -549,6 +549,10 @@ def parse_commit(parser):
parents.append(parser.get_mark())
parser.next()
+ # fast-export adds an extra newline
+ if data[-1] == '\n':
+ data = data[:-1]
+
files = {}
for line in parser: