Skip to content

Commit

Permalink
git-p4 submit: prevent 'Jobs' section from being removed from p4 chan…
Browse files Browse the repository at this point in the history
…ge 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 <michael.horowitz@ieee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Horowitz authored and Junio C Hamano committed Feb 26, 2011
1 parent 046613c commit c9dbab0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c9dbab0

Please sign in to comment.