Write out the options tag in the log message of imports only if we actually have

options

Signed-off-by: Simon Hausmann <simon@lst.de>

contrib/fast-import/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: "
+        self.gitStream.write("\n[git-p4: depot-paths = \"%s\": change = %s"
-                             "options = %s]\n"
+                             % (','.join (branchPrefixes), details["change"]))
-                             % (','.join (branchPrefixes), details["change"],
+        if len(details['options']) > 0:
-                                details['options']
+            self.gitStream.write(": options = %s" % details['options'])
-                                ))
+        self.gitStream.write("]\nEOT\n\n")
-        self.gitStream.write("EOT\n\n")
 
         if len(parent) > 0:
             if self.verbose: