git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
authorMichael Horowitz <michael.horowitz@ieee.org>
Sat, 26 Feb 2011 02:31:13 +0000 (21:31 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sat, 26 Feb 2011 07:39:41 +0000 (23:39 -0800)
In an attempt to overwrite the 'Description:' section of the p4 change
log to include the git commit messages, it also overwrote the 'Jobs:'
section. Â This fix restores the 'Job:' section.

Signed-off-by: Michael Horowitz <michael.horowitz@ieee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/fast-import/git-p4

index a92beb6292b49aebb12bfbb4535a94f148b88a3d..8b00fd87972846ec5ddfb20159867f86e91aa354 100755 (executable)
@@ -570,7 +570,7 @@ class P4Submit(Command):
                 continue
 
             if inDescriptionSection:
-                if line.startswith("Files:"):
+                if line.startswith("Files:") or line.startswith("Jobs:"):
                     inDescriptionSection = False
                 else:
                     continue