Merge branch 'mh/p4'

* mh/p4: git-p4 submit: prevent 'Jobs' section from being removed from p4 change log
2011-03-04 15:02:28 -08:00 · 2011-03-04 15:02:28 -08:00 · 6d74e5c9db
parent 08fd8710e2 c9dbab045d
commit 6d74e5c9db
1 changed files with 1 additions and 1 deletions
--- 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