[PATCH 2/4] git-p4: cope with labels with empty descriptions
From: Luke Diamand <hidden>
Date: 2016-06-15 22:52:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Use an explicit length for the data in a label, rather than EOT, so that labels with empty descriptions are passed through correctly. Signed-off-by: Luke Diamand <redacted> --- contrib/fast-import/git-p4 | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 822e6f1..f7707f2 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4@@ -1741,9 +1741,11 @@ class P4Sync(Command, P4UserMap): else: tagger = "%s <a@b> %s %s" % (owner, epoch, self.tz) self.gitStream.write("tagger %s\n" % tagger) - self.gitStream.write("data <<EOT\n") - self.gitStream.write(labelDetails["Description"]) - self.gitStream.write("EOT\n\n") + + description = labelDetails["Description"] + self.gitStream.write("data %d\n" % len(description)) + self.gitStream.write(description) + self.gitStream.write("\n") else: if not self.silent:
--
1.7.8.rc1.209.geac91.dirty