From 62d7323e48746850e139b7853a7d9c83656b9591 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon@lst.de>
Date: Mon, 11 Jun 2007 10:01:58 +0200
Subject: [PATCH] Write out the options tag in the log message of imports only
 if we actually have options

---
 git-p4 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/git-p4 b/git-p4
index ff56181..e380c14 100755
--- a/git-p4
+++ b/git-p4
@@ -765,12 +765,11 @@ class P4Sync(Command):
 
         self.gitStream.write("data <<EOT\n")
         self.gitStream.write(details["desc"])
-        self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s: "
-                             "options = %s]\n"
-                             % (','.join (branchPrefixes), details["change"],
-                                details['options']
-                                ))
-        self.gitStream.write("EOT\n\n")
+        self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s"
+                             % (','.join (branchPrefixes), details["change"]))
+        if len(details['options']) > 0:
+            self.gitStream.write(": options = %s" % details['options'])
+        self.gitStream.write("]\nEOT\n\n")
 
         if len(parent) > 0:
             if self.verbose:
-- 
2.11.4.GIT