From: Michael Horowitz Date: Sat, 26 Feb 2011 02:31:13 +0000 (-0500) Subject: git-p4 submit: prevent 'Jobs' section from being removed from p4 change log X-Git-Tag: v1.7.5-rc0~95^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c9dbab045dea3dc44b81bfaca957fd8c3c7f079b;p=git.git git-p4 submit: prevent 'Jobs' section from being removed from p4 change log 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 Signed-off-by: Junio C Hamano --- diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index a92beb629..8b00fd879 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -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